Changeset 1111 for s10k/XmlTools/xmlpatch.cpp

Timestamp:

Feb 16, 2019, 6:25:06 PM (6 years ago)

Author:

s10k

Message:

Added version 2.0e (bugfix in patch file for paths with apostrophes)

File:

• s10k/XmlTools/xmlpatch.cpp (modified) (2 diffs)

s10k/XmlTools/xmlpatch.cpp

@@ -374 +374 @@
             command=GlobalVars::AppExecutable;
 
-            // Append files if forced to
-            if(!this->forceTargetFilesWildcard.isEmpty()){
-                command+=" --files '"+this->forceTargetFilesWildcard+"' ";
-            }
-
             command+=" "+getPatchParameterValue(line,"Options");
 
@@ -392 +387 @@
             command.replace("'","\""); //replace apostrophe by quotes, to avoid problems
             command.replace("\"\"","'"); // this allow to use '' as ' ('' is transformed in "" and then in ')
+
+            // Append files if forced to
+
+            // This is added at the end so the apostrophe isn't done here (the path can contain it)
+            if(!this->forceTargetFilesWildcard.isEmpty()){
+                command+=" --files \""+this->forceTargetFilesWildcard+"\" ";
+            }
 
             executeCommandOperation(command);