Merge pull request #41 from oblivioncth/dev

Merge to master for v0.9.2.1
oblivioncth · Feb 11, 2023 · 6287996 · 6287996
2 parents f147035 + 9f01e5c
commit 6287996
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,15 +6,15 @@ cmake_minimum_required(VERSION 3.21.1)
 # Project
 # NOTE: DON'T USE TRAILING ZEROS IN VERSIONS
 project(CLIFp
-    VERSION 0.9.2
+    VERSION 0.9.2.1
     LANGUAGES CXX
     DESCRIPTION "Command-line Interface for Flashpoint"
 )
 set(FORMAL_NAME "CLI Flashpoint")
 string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LC)
 string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-set(TARGET_FP_VERSION_PREFIX 11.0)
+set(TARGET_FP_VERSION_PREFIX 11.1)
 
 # C++
 set(CMAKE_CXX_STANDARD 20)

diff --git a/src/task/t-exec_linux.cpp b/src/task/t-exec_linux.cpp
@@ -132,9 +132,9 @@ QString TExec::escapeForShell(const QString& argStr)
             inQuotes = !inQuotes;
 
         if(inQuotes)
-            escapedArgs.append(stdInQuotesEscapes.contains(chr) ? '^' + chr : chr);
+            escapedArgs.append(stdInQuotesEscapes.contains(chr) ? '\\' + chr : chr);
         else
-            escapedArgs.append(curOutQuotesEscapes.contains(chr) ? '^' + chr : chr);
+            escapedArgs.append(curOutQuotesEscapes.contains(chr) ? '\\' + chr : chr);
     }
 
     return escapedArgs;

diff --git a/src/task/t-exec_win.cpp b/src/task/t-exec_win.cpp
@@ -118,5 +118,7 @@ void TExec::logPreparedProcess(const QProcess* process)
     emit eventOccurred(NAME, LOG_EVENT_FINAL_EXECUTABLE.arg(process->program()));
     emit eventOccurred(NAME, LOG_EVENT_FINAL_PARAMETERS.arg(!process->nativeArguments().isEmpty() ?
                                                             process->nativeArguments() :
+                                                            !process->arguments().isEmpty() ?
+                                                            "{\"" + process->arguments().join(R"(", ")") + "\"}" :
                                                             ""));
 }