Is it the octane/other hydrocarbons that make gasoline smell or is it some other chemical added to it?

I recently learned that methanethiol is added to natural gas to make it smell in order to warn people of leaks. Same for gasoline? How about for propane and butane?