From c9035ce39629dca2df2be737f74fbaa1079cbb27 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 16 Oct 2016 17:38:37 +0200 Subject: [PATCH] Changed: Upgrade scripts --- code/ryzom/client/macosx/upgd_nl.sh | 36 ++++++++++------------------- code/ryzom/client/unix/upgd_nl.sh | 2 +- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/code/ryzom/client/macosx/upgd_nl.sh b/code/ryzom/client/macosx/upgd_nl.sh index c0da04a5a..d9ff9973d 100644 --- a/code/ryzom/client/macosx/upgd_nl.sh +++ b/code/ryzom/client/macosx/upgd_nl.sh @@ -12,33 +12,21 @@ MACOSPATH=$(dirname "$RYZOM_CLIENT") SIGNPATH=$CONTENTSPATH/_CodeSignature # all files of original Bundle are in the same directory -# we have to copy them to the right location +# we have to uncompress them to the right location # client_default.cfg and ryzom.icns are already in the right location -# PkgInfo usually doesn't change so don't copy it +# uncompress Ryzom +if [ -e "$ROOTPATH/Ryzom.zip" ] +then + unzip -o "$ROOTPATH/Ryzom.zip" -d "$CONTENTSPATH/.." +fi -# Info.plist contains updated version -cp -p "$ROOTPATH/Info.plist" "$CONTENTSPATH" - -cp -p "$ROOTPATH/CodeResources" "$SIGNPATH" - -# executable flag for all executables -chmod +x "$ROOTPATH/Ryzom" -chmod +x "$ROOTPATH/CrashReport" -chmod +x "$ROOTPATH/RyzomClientPatcher" -chmod +x "$ROOTPATH/RyzomConfiguration" - -# remove previous executables -rm -f "$MACOSPATH/Ryzom" -rm -f "$MACOSPATH/CrashReport" -rm -f "$MACOSPATH/RyzomClientPatcher" -rm -f "$MACOSPATH/RyzomConfiguration" - -# copy all binaries in MacOS directory -cp -p "$ROOTPATH/Ryzom" "$MACOSPATH" -cp -p "$ROOTPATH/CrashReport" "$MACOSPATH" -cp -p "$ROOTPATH/RyzomClientPatcher" "$MACOSPATH" -cp -p "$ROOTPATH/RyzomConfiguration" "$MACOSPATH" +# only uncompress Ryzom Installer if found in parent directory +if [ -e "$ROOTPATH/RyzomInstaller.zip" ] && [ -d "$CONTENTSPATH/../../Ryzom Installer.app" ] +then + rm -rf "$CONTENTSPATH/../../Ryzom Installer.app" + unzip -o "$ROOTPATH/RyzomInstaller.zip" -d "$CONTENTSPATH/../.." +fi exit 0 diff --git a/code/ryzom/client/unix/upgd_nl.sh b/code/ryzom/client/unix/upgd_nl.sh index 1b4ba0176..4265f1b26 100644 --- a/code/ryzom/client/unix/upgd_nl.sh +++ b/code/ryzom/client/unix/upgd_nl.sh @@ -16,7 +16,7 @@ chmod +x "$ROOTPATH/ryzom_installer_qt" # copy Ryzom Installer if present in parent directory if [ -e "$ROOTPATH/../ryzom_installer_qt" ] then - rm -f "$ROOTPATH/../ryzom_installer_qt" + rm -f "$ROOTPATH/../ryzom_installer_qt" cp -a "$ROOTPATH/ryzom_installer_qt" "$ROOTPATH/.." fi