From bd5c60134b9880da5f2e3c828587bfe181c6140d Mon Sep 17 00:00:00 2001 From: Matthias Ruester Date: Wed, 23 Sep 2015 23:08:26 +0200 Subject: [PATCH] Always quote $@ to prevent globbing --- src/bee-cache-update.sh.in | 2 +- src/bee-query.sh.in | 2 +- src/bee-update.sh.in | 2 +- src/beefind.sh.in | 2 +- src/beesh.sh.in | 4 ++-- src/compat-filesfile2contentfile.sh.in | 2 +- src/filelist2content.sh.in | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bee-cache-update.sh.in b/src/bee-cache-update.sh.in index d3e05c9..5ca8ac6 100644 --- a/src/bee-cache-update.sh.in +++ b/src/bee-cache-update.sh.in @@ -32,7 +32,7 @@ fi function print_info() { - echo ${@} + echo "${@}" } function create_pkgbcfile() diff --git a/src/bee-query.sh.in b/src/bee-query.sh.in index a6e2755..cb59e7f 100644 --- a/src/bee-query.sh.in +++ b/src/bee-query.sh.in @@ -52,7 +52,7 @@ usage() { } function query() { - list=$@ + list="$@" for f in "${list[@]}" ; do # check if $f is pkg, list related files diff --git a/src/bee-update.sh.in b/src/bee-update.sh.in index 14364b8..d9459a2 100644 --- a/src/bee-update.sh.in +++ b/src/bee-update.sh.in @@ -32,4 +32,4 @@ VERSION=${BEE_VERSION} : ${BEE_LIBEXECDIR:=@LIBEXECDIR@} -exec ${BEE_LIBEXECDIR}/bee/bee.d/bee-install --update ${@} +exec ${BEE_LIBEXECDIR}/bee/bee.d/bee-install --update "${@}" diff --git a/src/beefind.sh.in b/src/beefind.sh.in index 79f7240..82bebf2 100644 --- a/src/beefind.sh.in +++ b/src/beefind.sh.in @@ -151,4 +151,4 @@ if [ -n "${OPT_OUTPUT}" ] ; then fi fi -do_beefind ${@} +do_beefind "${@}" diff --git a/src/beesh.sh.in b/src/beesh.sh.in index d33ee67..eddeb9e 100644 --- a/src/beesh.sh.in +++ b/src/beesh.sh.in @@ -297,13 +297,13 @@ function fetch_one_file() { } function fetch_one_archive() { - fetch_one_file $@ + fetch_one_file "$@" bee_SOURCEFILES=( ${bee_SOURCEFILES[@]} ${bee_FETCHED_FILE} ) } function fetch_one_patch() { - fetch_one_file $@ + fetch_one_file "$@" if [ "${bee_FETCHED_FILE: -3:3}" = ".gz" ] ; then if gunzip "${bee_FETCHED_FILE}" -c >"${bee_FETCHED_FILE%.gz}" ; then diff --git a/src/compat-filesfile2contentfile.sh.in b/src/compat-filesfile2contentfile.sh.in index 4c64e78..af558fc 100644 --- a/src/compat-filesfile2contentfile.sh.in +++ b/src/compat-filesfile2contentfile.sh.in @@ -82,4 +82,4 @@ while read line ; do fi echo ":file=${file}" -done < <(cat $@) +done < <(cat "$@") diff --git a/src/filelist2content.sh.in b/src/filelist2content.sh.in index 9600b1d..93cc816 100644 --- a/src/filelist2content.sh.in +++ b/src/filelist2content.sh.in @@ -159,4 +159,4 @@ while true ; do esac done -do_f2c <(cat ${@}) "${OPT_ROOT}" +do_f2c <(cat "${@}") "${OPT_ROOT}"