Trump signs bill averting government shutdown; fight on coronavirus aid drags on