Merge pull request #1007 from kalxas/master

sync install script with OSGeoLive 7.0beta1