From e565df94fd7a6a4fb2b6a51c3cd938825c66390e Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 30 Dec 2024 00:50:53 +0000 Subject: 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 --- include/git.sh | 2 +- include/lib.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'include') 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 } -- cgit v1.2.1