Merge with develop

This commit is contained in:
kervala 2016-10-17 16:51:42 +02:00
parent 4d36b39ebc
commit bbb97b7b5b

View file

@ -19,14 +19,14 @@ SIGNPATH=$CONTENTSPATH/_CodeSignature
# uncompress Ryzom # uncompress Ryzom
if [ -e "$ROOTPATH/Ryzom.zip" ] if [ -e "$ROOTPATH/Ryzom.zip" ]
then then
unzip -o "$ROOTPATH/Ryzom.zip" -d "$CONTENTSPATH/.." unzip -o "$ROOTPATH/Ryzom.zip" -d "$CONTENTSPATH/../.."
fi fi
# only uncompress Ryzom Installer if found in parent directory # only uncompress Ryzom Installer if found in parent directory
if [ -e "$ROOTPATH/RyzomInstaller.zip" ] && [ -d "$CONTENTSPATH/../../Ryzom Installer.app" ] if [ -e "$ROOTPATH/RyzomInstaller.zip" ] && [ -d "$CONTENTSPATH/../../../Ryzom Installer.app" ]
then then
rm -rf "$CONTENTSPATH/../../Ryzom Installer.app" rm -rf "$CONTENTSPATH/../../../Ryzom Installer.app"
unzip -o "$ROOTPATH/RyzomInstaller.zip" -d "$CONTENTSPATH/../.." unzip -o "$ROOTPATH/RyzomInstaller.zip" -d "$CONTENTSPATH/../../.."
fi fi
exit 0 exit 0