From 5999a00d68fb19cd77df222bd72cbc9dae53663c Mon Sep 17 00:00:00 2001 From: Expand-sys <79956551+Expand-sys@users.noreply.github.com> Date: Mon, 21 Nov 2022 13:55:42 +1100 Subject: [PATCH 1/3] Update CMakeLists.txt smh my leg my armpit and my dog, twix doesnt know how to escape characters. fixed escaping quotations. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7fdc565..aa7a513 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,13 +38,13 @@ target_sources(${PROJECT_NAME} PRIVATE ) if(DEFINED USER_SAVE_LOC) -set(USER_SAVE "\"" + ${USER_SAVE_LOC} + "\"") +set(USER_SAVE "\"${USER_SAVE_LOC}\"") else() set(USER_SAVE "\"../config/users.dat\"") endif() if(DEFINED DROGON_CONFIG_LOC) -set(DROGON_CONFIG "\"" + ${DROGON_CONFIG_LOC} + "\"") +set(DROGON_CONFIG "\"${DROGON_CONFIG_LOC}\"") else() set(DROGON_CONFIG "\"../config/config.json\"") endif() From d56599f49ac1b649903bac6a70a90c8c7f97507b Mon Sep 17 00:00:00 2001 From: EntireTwix Date: Sun, 20 Nov 2022 20:10:12 -0800 Subject: [PATCH 2/3] :bug: return on del arg --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa7a513..1ba9430 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,7 @@ endif() if(DEFINED RETURN_ON_DEL_NAME) set(RETURN_ON_DEL_VAL true) -set(RETURN_ON_DEL_NAME_VAL "\"" + ${RETURN_ON_DEL_NAME} + "\"") +set(RETURN_ON_DEL_NAME_VAL "\""${RETURN_ON_DEL_NAME}"\"") else() set(RETURN_ON_DEL_VAL false) set(RETURN_ON_DEL_NAME_VAL "\"\"") From 2fa6a7a7436340b80a0c65194bff8410fb0c80bb Mon Sep 17 00:00:00 2001 From: EntireTwix Date: Sun, 20 Nov 2022 20:10:30 -0800 Subject: [PATCH 3/3] :fire: file generation --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6ea7c41..80a789e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,5 +15,4 @@ RUN make -j$(nproc) ARG ADMIN_A=admin ARG SAVE_FREQ=2 -RUN ["sh", "-c", "/CCash/config/ssl.sh && /CCash/build/bank"] CMD ["sh", "-c", "/CCash/config/ssl.sh && /CCash/build/bank ${ADMIN_A} ${SAVE_FREQ}"] \ No newline at end of file