Skip to content

Commit

Permalink
Fix shellcheck problem in scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
Maijin committed Apr 29, 2015
1 parent 40de063 commit 6aefa44
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
acr -p
if [ -n "$1" ]; then
echo "./configure $*"
./configure "$@"
./configure $*
fi
8 changes: 4 additions & 4 deletions binr/old.rarc2/rarc2-tool
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -40,15 +40,15 @@ done

shift $((${OPTIND}-1))

if [ -n "`echo "$@"`" ]; then
if [ -n "`echo $*`" ]; then
if [ -n "$r" ]; then
RF=""
ARCH=x86
n=1
elif [ -n "$n" ]; then
RF=""
fi
compile "$@"
compile $*
if [ -n "$c" ]; then
# rasm2 and rabin2
rasm2 -a x86.olly -f .a.S > .a.x
Expand Down
2 changes: 1 addition & 1 deletion configure.hook
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ case "$1" in
;;
*)
[ plugins.def.cfg -nt ./plugins.cfg ] && rm -f plugins.cfg
./configure-plugins "$@"
./configure-plugins $*
;;
esac
2 changes: 1 addition & 1 deletion sys/afl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 $*
2 changes: 1 addition & 1 deletion sys/asan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 $*
2 changes: 1 addition & 1 deletion sys/farm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ testcc() {
}

log() {
echo "$@" ; echo "$@" >> ${LOGFILE}
echo $* ; echo $* >> ${LOGFILE}
}

logchk() {
Expand Down
2 changes: 1 addition & 1 deletion sys/indent.sh
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions sys/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion sys/ios-sdk-gcc
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ LDFLAGS="-L ${IOSROOT}/usr/lib/ ${LDFLAGS}"
#fi

# arm64
${CC} ${CFLAGS} ${LDFLAGS} "$@"
${CC} ${CFLAGS} ${LDFLAGS} $*
4 changes: 2 additions & 2 deletions sys/locdiff
Original file line number Diff line number Diff line change
@@ -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))
6 changes: 3 additions & 3 deletions sys/ndk-gcc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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} $*

0 comments on commit 6aefa44

Please sign in to comment.