Glasgow isn't as bad as everyone makes out, it gets a bad rep, I lived in Glasgow for 4 months in the city centre and loved it, I'd say the shopping /amenities/nightlife are far better than Edinburgh, there is just MORE in Glasgow.
However I am from Edinburgh and I'm bias towards that, Edinburgh is a better looking place in my opinion :P, becomes very tourist orientated in the summer, has a similar vibe to Glasgow but has significantly less shops, clubs etc.
Both very friendly, its really impossible for us to pick. I think you should visit both of them if you can get the chance.