From bbb97b7b5ba3c803352a7363d43247f7fd6e95fb Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 17 Oct 2016 16:51:42 +0200 Subject: [PATCH] Merge with develop --- code/ryzom/client/macosx/upgd_nl.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/ryzom/client/macosx/upgd_nl.sh b/code/ryzom/client/macosx/upgd_nl.sh index d9ff9973d..cae698a69 100755 --- a/code/ryzom/client/macosx/upgd_nl.sh +++ b/code/ryzom/client/macosx/upgd_nl.sh @@ -19,14 +19,14 @@ SIGNPATH=$CONTENTSPATH/_CodeSignature # uncompress Ryzom if [ -e "$ROOTPATH/Ryzom.zip" ] then - unzip -o "$ROOTPATH/Ryzom.zip" -d "$CONTENTSPATH/.." + unzip -o "$ROOTPATH/Ryzom.zip" -d "$CONTENTSPATH/../.." fi # 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 - rm -rf "$CONTENTSPATH/../../Ryzom Installer.app" - unzip -o "$ROOTPATH/RyzomInstaller.zip" -d "$CONTENTSPATH/../.." + rm -rf "$CONTENTSPATH/../../../Ryzom Installer.app" + unzip -o "$ROOTPATH/RyzomInstaller.zip" -d "$CONTENTSPATH/../../.." fi exit 0