From 227743fdc5202b5ca03a15d5864a90c4f73620c0 Mon Sep 17 00:00:00 2001 From: Christian Heimlich Date: Fri, 10 Feb 2023 15:07:25 -0500 Subject: [PATCH 1/4] Bump target FP versioon --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b61af9..17980a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ 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) From 70e6dab11157f3e1b29c316e0f5cafbbedf71ae2 Mon Sep 17 00:00:00 2001 From: Christian Heimlich Date: Sat, 11 Feb 2023 05:36:44 -0500 Subject: [PATCH 2/4] Fix shell escape character on Linux The Windows cmd escape character '^' was accidentally being used instead of '\'. --- src/task/t-exec_linux.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/task/t-exec_linux.cpp b/src/task/t-exec_linux.cpp index 296453f..a450a5c 100644 --- 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; From 353f5a4644edd2ce0fd73346e2fb0ac12806361a Mon Sep 17 00:00:00 2001 From: Christian Heimlich Date: Sat, 11 Feb 2023 05:43:31 -0500 Subject: [PATCH 3/4] Fix missing "Final Parameters" log entry for some TExec on Windows --- src/task/t-exec_win.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/task/t-exec_win.cpp b/src/task/t-exec_win.cpp index 79efc4f..cfa9a64 100644 --- 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"(", ")") + "\"}" : "")); } From 9f01e5cc5a82b85239758076fc6a251279ed49d3 Mon Sep 17 00:00:00 2001 From: Christian Heimlich Date: Sat, 11 Feb 2023 05:51:38 -0500 Subject: [PATCH 4/4] Bump for v0.9.2.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17980a3..3d833b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ 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" )