From cd9d2cdd5d0f6f93c1593e244212dd3734cf539b Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Mon, 29 Feb 2016 09:32:27 +0100
Subject: [PATCH] Fixed: Escape paths with quotes under OS X

---
 code/ryzom/client/macosx/upgd_nl.sh | 30 +++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/code/ryzom/client/macosx/upgd_nl.sh b/code/ryzom/client/macosx/upgd_nl.sh
index 046034027..c0da04a5a 100644
--- a/code/ryzom/client/macosx/upgd_nl.sh
+++ b/code/ryzom/client/macosx/upgd_nl.sh
@@ -7,8 +7,8 @@ then
 fi
 
 # determine directory where all files reside
-CONTENTSPATH=$(dirname $ROOTPATH)
-MACOSPATH=$(dirname $RYZOM_CLIENT)
+CONTENTSPATH=$(dirname "$ROOTPATH")
+MACOSPATH=$(dirname "$RYZOM_CLIENT")
 SIGNPATH=$CONTENTSPATH/_CodeSignature
 
 # all files of original Bundle are in the same directory
@@ -19,20 +19,26 @@ SIGNPATH=$CONTENTSPATH/_CodeSignature
 # PkgInfo usually doesn't change so don't copy it
 
 # Info.plist contains updated version
-cp -p $ROOTPATH/Info.plist $CONTENTSPATH
+cp -p "$ROOTPATH/Info.plist" "$CONTENTSPATH"
 
-cp -p $ROOTPATH/CodeResources $SIGNPATH
+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
+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
+cp -p "$ROOTPATH/Ryzom" "$MACOSPATH"
+cp -p "$ROOTPATH/CrashReport" "$MACOSPATH"
+cp -p "$ROOTPATH/RyzomClientPatcher" "$MACOSPATH"
+cp -p "$ROOTPATH/RyzomConfiguration" "$MACOSPATH"
 
 exit 0