Changed: Upgrade scripts

--HG--
branch : develop

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" ]
-# Info.plist contains updated version
+then
-cp -p "$ROOTPATH/Info.plist" "$CONTENTSPATH"
+  unzip -o "$ROOTPATH/Ryzom.zip" -d "$CONTENTSPATH/.."
-
+fi
-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
+# only uncompress Ryzom Installer if found in parent directory
-cp -p "$ROOTPATH/Ryzom" "$MACOSPATH"
+if [ -e "$ROOTPATH/RyzomInstaller.zip" ] && [ -d "$CONTENTSPATH/../../Ryzom Installer.app" ]
-cp -p "$ROOTPATH/CrashReport" "$MACOSPATH"
+then
-cp -p "$ROOTPATH/RyzomClientPatcher" "$MACOSPATH"
+  rm -rf "$CONTENTSPATH/../../Ryzom Installer.app"
-cp -p "$ROOTPATH/RyzomConfiguration" "$MACOSPATH"
+  unzip -o "$ROOTPATH/RyzomInstaller.zip" -d "$CONTENTSPATH/../.."
+fi
 
 exit 0