diff options
| author | Leah Rowe <leah@libreboot.org> | 2024-12-30 00:50:53 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2024-12-30 01:02:22 +0000 |
| commit | e565df94fd7a6a4fb2b6a51c3cd938825c66390e (patch) | |
| tree | cd8367ed4146962695bf82ced4ec76ba1dc116df | |
| parent | c80cc0a00b6fbe5e94bb35c5760e224ce70c09f0 (diff) | |
Fix globbing issue in lbmk
When doing e.g. $@ we should use double quotes to prevent globbing.
Thanks go to XRevan86 for pointing this out.
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rwxr-xr-x | build | 12 | ||||
| -rw-r--r-- | include/git.sh | 2 | ||||
| -rw-r--r-- | include/lib.sh | 4 | ||||
| -rwxr-xr-x | script/trees | 2 |
4 files changed, 10 insertions, 10 deletions
@@ -32,16 +32,16 @@ main() case "${spath#script/}" in version) printf "%s\nWebsite: %s\n" "$relname" "$projectsite" ;; - release) shift 1; mkrelease $@ ;; - inject) shift 1; vendor_inject $@ ;; - download) shift 1; vendor_download $@ ;; + release) shift 1; mkrelease "$@" ;; + inject) shift 1; vendor_inject "$@" ;; + download) shift 1; vendor_download "$@" ;; roms) [ $# -gt 1 ] && [ "$2" = "serprog" ] && \ mk -b stm32-vserprog pico-serprog && return 0 - shift 1; x_ ./mk -b coreboot $@ ;; + shift 1; x_ ./mk -b coreboot "$@" ;; *) [ -f "$spath" ] || $err "bad command" - $shcmd; "$spath" $@ || $err "excmd: $spath $(echo "$@")" ;; + $shcmd; "$spath" "$@" || $err "excmd: $spath $(echo "$@")" ;; esac set -u -e # some commands disable them. turn them on! } @@ -128,5 +128,5 @@ tmp_cleanup() rm -f lock || return 1 } -main $@ +main "$@" tmp_cleanup || err_ "can't rm TMPDIR upon non-zero exit: $TMPDIR" diff --git a/include/git.sh b/include/git.sh index 77a22763..aaeabcd4 100644 --- a/include/git.sh +++ b/include/git.sh @@ -115,7 +115,7 @@ tmpclone() git_am_patches "$3" "$5" ) || repofail="y" - [ "$repofail" = "y" ] && [ $# -lt 6 ] && tmpclone $@ retry + [ "$repofail" = "y" ] && [ $# -lt 6 ] && tmpclone "$@" retry [ "$repofail" = "y" ] && $err "!clone $1 $2 $3 $4 $5"; : } diff --git a/include/lib.sh b/include/lib.sh index f204309d..07b9a8da 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -80,7 +80,7 @@ install_packages() printf "You need AUR packages: %s\n" "$aur_notice" 1>&2; return 0 } if [ $# -gt 0 ] && [ "$1" = "dependencies" ]; then - install_packages $@ || exit 1 + install_packages "$@" || exit 1 exit 0 fi @@ -119,7 +119,7 @@ expr "X$XBMK_THREADS" : "X-\{0,1\}[0123456789][0123456789]*$" \ 1>/dev/null 2>/dev/null || export XBMK_THREADS=1 # user gave a non-integer x_() { - [ $# -lt 1 ] || $@ || \ + [ $# -lt 1 ] || "$@" || \ $err "Unhandled non-zero exit: $(echo "$@")"; return 0 } diff --git a/script/trees b/script/trees index b9fd21eb..57e19b63 100755 --- a/script/trees +++ b/script/trees @@ -294,6 +294,6 @@ copy_elf() done < "$listfile"; x_ make clean -C "$srcdir" $cleanargs } -main $@ || exit 0 +main "$@" || exit 0 . "$mkhelpercfg" $cmd |