From 6aefa441b118f183144a70cc94bae2e7ecf07e66 Mon Sep 17 00:00:00 2001 From: Maijin Date: Wed, 29 Apr 2015 10:41:18 +0200 Subject: [PATCH] Fix shellcheck problem in scripts --- autogen.sh | 2 +- binr/old.rarc2/rarc2-tool | 8 ++++---- configure.hook | 2 +- sys/afl.sh | 2 +- sys/asan.sh | 2 +- sys/farm.sh | 2 +- sys/indent.sh | 2 +- sys/install.sh | 4 ++-- sys/ios-sdk-gcc | 2 +- sys/locdiff | 4 ++-- sys/ndk-gcc | 6 +++--- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/autogen.sh b/autogen.sh index 49f1b4149f..799b8e2070 100755 --- a/autogen.sh +++ b/autogen.sh @@ -8,5 +8,5 @@ acr -p if [ -n "$1" ]; then echo "./configure $*" - ./configure "$@" + ./configure $* fi diff --git a/binr/old.rarc2/rarc2-tool b/binr/old.rarc2/rarc2-tool index d901a7a1ba..d0afbb7b76 100755 --- a/binr/old.rarc2/rarc2-tool +++ b/binr/old.rarc2/rarc2-tool @@ -9,9 +9,9 @@ RF="-s" compile() { spp -h >/dev/null 2>&1 if [ $? = 0 ]; then - spp -Darch=${ARCH} "$@" | rarc2 $RF -a${ARCH} > .a.S || exit $? + spp -Darch=${ARCH} $* | rarc2 $RF -a${ARCH} > .a.S || exit $? else - rarc2 $RF -a${ARCH} "$@" > .a.S || exit $? + rarc2 $RF -a${ARCH} $* > .a.S || exit $? fi } @@ -40,7 +40,7 @@ done shift $((${OPTIND}-1)) -if [ -n "`echo "$@"`" ]; then +if [ -n "`echo $*`" ]; then if [ -n "$r" ]; then RF="" ARCH=x86 @@ -48,7 +48,7 @@ if [ -n "`echo "$@"`" ]; then elif [ -n "$n" ]; then RF="" fi - compile "$@" + compile $* if [ -n "$c" ]; then # rasm2 and rabin2 rasm2 -a x86.olly -f .a.S > .a.x diff --git a/configure.hook b/configure.hook index 9a121790db..efe574b0cd 100755 --- a/configure.hook +++ b/configure.hook @@ -5,6 +5,6 @@ case "$1" in ;; *) [ plugins.def.cfg -nt ./plugins.cfg ] && rm -f plugins.cfg - ./configure-plugins "$@" + ./configure-plugins $* ;; esac diff --git a/sys/afl.sh b/sys/afl.sh index bbbd373a15..a0e5a8b0de 100755 --- a/sys/afl.sh +++ b/sys/afl.sh @@ -12,4 +12,4 @@ if [ $RET != 0 ]; then echo "Your compiler doesn't supports AFL" exit 1 fi -exec sys/install.sh "$@" +exec sys/install.sh $* diff --git a/sys/asan.sh b/sys/asan.sh index ea97d40c03..ca021165b8 100755 --- a/sys/asan.sh +++ b/sys/asan.sh @@ -10,4 +10,4 @@ if [ $RET != 0 ]; then echo "Your compiler doesn't supports ASAN." exit 1 fi -exec sys/install.sh "$@" +exec sys/install.sh $* diff --git a/sys/farm.sh b/sys/farm.sh index 2167154b8c..dec5d81ad4 100755 --- a/sys/farm.sh +++ b/sys/farm.sh @@ -33,7 +33,7 @@ testcc() { } log() { - echo "$@" ; echo "$@" >> ${LOGFILE} + echo $* ; echo $* >> ${LOGFILE} } logchk() { diff --git a/sys/indent.sh b/sys/indent.sh index bc9cbfd7ec..919496767b 100755 --- a/sys/indent.sh +++ b/sys/indent.sh @@ -1,4 +1,4 @@ #!/bin/sh D=`dirname $PWD/$0` -uncrustify -c ${D}/uncrustify.cfg "$@" +uncrustify -c ${D}/uncrustify.cfg $* diff -ru $1 $1.uncrustify diff --git a/sys/install.sh b/sys/install.sh index 2f0dfda1c9..9e5340314f 100755 --- a/sys/install.sh +++ b/sys/install.sh @@ -24,7 +24,7 @@ fi [ -n "${NOSUDO}" ] && SUDO= if [ "${HARDEN}" = 1 ]; then - ./sys/build-harden.sh "$@" && ${SUDO} ${MAKE} symstall + ./sys/build-harden.sh $* && ${SUDO} ${MAKE} symstall else - ./sys/build.sh "$@" && ${SUDO} ${MAKE} symstall + ./sys/build.sh $* && ${SUDO} ${MAKE} symstall fi diff --git a/sys/ios-sdk-gcc b/sys/ios-sdk-gcc index 28f9002855..c11f3f6172 100755 --- a/sys/ios-sdk-gcc +++ b/sys/ios-sdk-gcc @@ -60,4 +60,4 @@ LDFLAGS="-L ${IOSROOT}/usr/lib/ ${LDFLAGS}" #fi # arm64 -${CC} ${CFLAGS} ${LDFLAGS} "$@" +${CC} ${CFLAGS} ${LDFLAGS} $* diff --git a/sys/locdiff b/sys/locdiff index 4718a140d8..259d42e33b 100755 --- a/sys/locdiff +++ b/sys/locdiff @@ -1,6 +1,6 @@ #!/bin/sh #A=`hg diff $@ | grep -v '+++' | grep ^+ |wc -l` #B=`hg diff $@ | grep -v -- '---' | grep ^- |wc -l` -A=`git diff "$@" | grep -v '+++' | grep ^+ |wc -l` -B=`git diff "$@" | grep -v -- '---' | grep ^- |wc -l` +A=`git diff $* | grep -v '+++' | grep ^+ |wc -l` +B=`git diff $* | grep -v -- '---' | grep ^- |wc -l` echo $((A-B)) diff --git a/sys/ndk-gcc b/sys/ndk-gcc index 5bafc63195..9b99fa8ac8 100755 --- a/sys/ndk-gcc +++ b/sys/ndk-gcc @@ -91,7 +91,7 @@ esac #LDFLAGS="${LDFLAGS} -Wl,-dynamic-linker=/system/bin/linker" LDFLAGS="${LDFLAGS} --sysroot=${PLATFORM_ROOT}" -#if [ -z "`echo "$@"" | grep shared`" ]; then +#if [ -z "`echo $*" | grep shared`" ]; then #LDFLAGS="${LDFLAGS} ${PLATFORM_PATH}/lib/crtbegin_dynamic.o" #fi CC=${NDKPFX}-gcc @@ -100,5 +100,5 @@ EXT_SO=so export PATH=${NDK_BINS}:$PATH export EXT_SO AR CC CFLAGS LDFLAGS PATH -# echo ${CC} ${CFLAGS} ${LDFLAGS} "$@"" -${CC} ${CFLAGS} ${LDFLAGS} "$@" +# echo ${CC} ${CFLAGS} ${LDFLAGS} $*" +${CC} ${CFLAGS} ${LDFLAGS} $*