From 7c730557f2f8da6869e775755d9a3416ef03ac6d Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Tue, 25 Oct 2022 21:08:34 +0530 Subject: [PATCH] Shell escape SRC and TARGET for logging --- src/init.lua | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/init.lua b/src/init.lua index 42d7010..ce7acf5 100644 --- a/src/init.lua +++ b/src/init.lua @@ -1689,14 +1689,16 @@ xplr.config.modes.builtin.rename = { { BashExecSilently0 = [===[ SRC="${XPLR_FOCUS_PATH:?}" + SRC_ESC=$(printf %q "$SRC") TARGET="${XPLR_INPUT_BUFFER:?}" + TARGET_ESC=$(printf %q "$TARGET") if [ -e "${TARGET:?}" ]; then - "$XPLR" -m 'LogError: %q' "$TARGET already exists" + "$XPLR" -m 'LogError: %q' "$TARGET_ESC already exists" else mv -- "${SRC:?}" "${TARGET:?}" \ && "$XPLR" -m ExplorePwd \ && "$XPLR" -m 'FocusPath: %q' "$TARGET" \ - && "$XPLR" -m 'LogSuccess: %q' "$SRC renamed to $TARGET" + && "$XPLR" -m 'LogSuccess: %q' "$SRC_ESC renamed to $TARGET_ESC" fi ]===], }, @@ -1731,14 +1733,16 @@ xplr.config.modes.builtin.duplicate_as = { { BashExecSilently0 = [===[ SRC="${XPLR_FOCUS_PATH:?}" + SRC_ESC=$(printf %q "$SRC") TARGET="${XPLR_INPUT_BUFFER:?}" + TARGET_ESC=$(printf %q "$TARGET") if [ -e "${TARGET:?}" ]; then - "$XPLR" -m 'LogError: %q' "$TARGET already exists" + "$XPLR" -m 'LogError: %q' "$TARGET_ESC already exists" else cp -r -- "${SRC:?}" "${TARGET:?}" \ && "$XPLR" -m ExplorePwd \ - && "$XPLR" -m 'FocusPath: %q' "$TARGET" \ - && "$XPLR" -m 'LogSuccess: %q' "$SRC duplicated as $TARGET" + && "$XPLR" -m 'FocusPath: %q' "$TARGET_ESC" \ + && "$XPLR" -m 'LogSuccess: %q' "$SRC_ESC duplicated as $TARGET_ESC" fi ]===], },