From 39961dc9f67045a54e9ad8b1497c63b69a4b3705 Mon Sep 17 00:00:00 2001 From: jwerle Date: Thu, 31 Mar 2022 09:04:38 -0400 Subject: [PATCH] fix(lib/run/run.sh): encapsulate commands in runner --- lib/run/run.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/run/run.sh b/lib/run/run.sh index ec8d0fe..da13dab 100755 --- a/lib/run/run.sh +++ b/lib/run/run.sh @@ -46,6 +46,14 @@ usage () { echo ' or: bpkg-run [-s|--source] / [command]' } +runner () { + local cmd="$1" + shift + # shellcheck disable=SC2068 + eval "$cmd" + return 0 +} + bpkg_run () { local should_emit_source=0 local should_source=0 @@ -118,7 +126,7 @@ bpkg_run () { shift # shellcheck disable=SC2068 - eval "$prefix" ${args[@]} $@ + runner "$prefix ${args[*]}" $@ return $? fi fi @@ -193,7 +201,7 @@ bpkg_run () { shift # shellcheck disable=SC2068 - eval "$prefix" ${args[@]} $@ + runner "$prefix ${args[*]}" $@ fi # shellcheck disable=SC2068