Fix Linux args passing

Author: witcher112

Assets/PatchKit Patcher/Editor/PatcherManifestCreator.cs

@@ -100,12 +100,12 @@ private static Manifest LinuxManifest(string buildPath)
                 Capabilities = Capabilities(),
                 Arguments = new Manifest.Argument[] {
                     CreateManifestAgument(launchScriptPath),
-                    CreateManifestAgument("--exedir", "\"{exedir}\""),
-                    CreateManifestAgument("--secret", "\"{secret}\""),
-                    CreateManifestAgument("--installdir", "\"{installdir}\""),
+                    CreateManifestAgument("--exedir", "{exedir}"),
+                    CreateManifestAgument("--secret", "{secret}"),
+                    CreateManifestAgument("--installdir", "{installdir}"),
                     CreateManifestAgument("--network-status", "{network-status}"),
-                    CreateManifestAgument("--patcher-exe", "\"" + patcherExe + "\""),
-                    CreateManifestAgument("--lockfile", "\"{lockfile}\""),
+                    CreateManifestAgument("--patcher-exe", patcherExe),
+                    CreateManifestAgument("--lockfile", "{lockfile}"),
                 }
             };
         }

Assets/PatchKit Patcher/Editor/patcher.template.sh

@@ -27,45 +27,45 @@ while [ "$1" != "" ] && [ "$2" != "" ]; do
     shift
 done
 
-if [ -z $PATCHER_EXE ]
+if [ -z "$PATCHER_EXE" ]
 then
     echo "Missing --patcher-exe argument"
     exit 1
 fi
 
-if [ -z $EXEDIR ]
+if [ -z "$EXEDIR" ]
 then
     echo "Missing --exedir argument"
     exit 1
 fi
 
-if [ -z $SECRET ]
+if [ -z "$SECRET" ]
 then
     echo "Missing --secret argument"
     exit 1
 fi
 
-if [ -z $INSTALLDIR ]
+if [ -z "$INSTALLDIR" ]
 then
     echo "Missing --installdir argument"
     exit 1
 fi
 
-LD_DIRS="`find "$EXEDIR" -name "x86_64" -printf "%p:"`"
-LD_DIRS="$LD_DIRS`find "$EXEDIR" -name "x86" -printf "%p:"`"
+LD_DIRS_X64=`find "$EXEDIR" -name "x86_64" -printf "%p:"`
+LD_DIRS_X86=`find "$EXEDIR" -name "x86" -printf "%p:"`
 
-export LD_LIBRARY_PATH="$LD_DIRS"
+export LD_LIBRARY_PATH="$LD_DIRS_X64:$LD_DIRS_X86"
 
-ARGS="--installdir $INSTALLDIR --secret $SECRET"
+ARGS="--installdir \"$INSTALLDIR\" --secret $SECRET"
 
 if [ ! -z "$LOCKFILE" ]
 then
-    ARGS="$ARGS --lockfile $LOCKFILE"
+    ARGS="$ARGS --lockfile \"$LOCKFILE\""
 fi
 
 if [ ! -z "$NETWORK_STATUS" ]
 then
     ARGS="$ARGS --${NETWORK_STATUS}"
 fi
 
-"$EXEDIR/$PATCHER_EXE" $ARGS
+sh -c "\"$EXEDIR/$PATCHER_EXE\" $ARGS"