modify to use single/double quote in command's arguments