diff options
Diffstat (limited to 'scripts/lib')
| -rw-r--r-- | scripts/lib/lib_common.sh | 7 | ||||
| -rw-r--r-- | scripts/lib/lib_handle.sh | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/scripts/lib/lib_common.sh b/scripts/lib/lib_common.sh index 629bdc7..9256967 100644 --- a/scripts/lib/lib_common.sh +++ b/scripts/lib/lib_common.sh @@ -109,6 +109,9 @@ run() { [ "${reload_compositor}" -eq 1 ] && compositor_handle stop - eval "${@}" - [ "${no_exit}" -eq 1 ] || exit "${?}" + "${@}" + status=$? + [ "${no_exit}" -ne 0 ] && return "${status}" + + exit "${status}" } diff --git a/scripts/lib/lib_handle.sh b/scripts/lib/lib_handle.sh index 1973144..5405e4a 100644 --- a/scripts/lib/lib_handle.sh +++ b/scripts/lib/lib_handle.sh @@ -80,7 +80,7 @@ input_device_handle() { "list") xinput list ;; "get-id") dev=$(xinput list --name-only | grep -i -m1 "${2}" ) || return 1 - printf "${dev#∼ }" + printf "%s" "${dev#∼ }" ;; "is_enabled") xinput list-props "${2}" | grep -q "Device Enabled.*1$" @@ -150,5 +150,5 @@ menu_handle() { "center") flags="-bw 1 -c -g 1 -l 25" ;; esac shift - dmenu ${flags} + dmenu "${flags}" } |