Commit a4fccbbf9d534daba7be11d9f1e0762df939dab8
2014-11-17T07:01:40
Run shell scripts through shellcheck
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75
diff --git a/script/cibuild.sh b/script/cibuild.sh
index abe31d0..360c286 100755
--- a/script/cibuild.sh
+++ b/script/cibuild.sh
@@ -7,13 +7,14 @@ then
fi
# Create a test repo which we can use for the online::push tests
-mkdir $HOME/_temp
-git init --bare $HOME/_temp/test.git
-git daemon --listen=localhost --export-all --enable=receive-pack --base-path=$HOME/_temp $HOME/_temp 2>/dev/null &
+mkdir "$HOME"/_temp
+git init --bare "$HOME"/_temp/test.git
+git daemon --listen=localhost --export-all --enable=receive-pack --base-path="$HOME"/_temp "$HOME"/_temp 2>/dev/null &
export GITTEST_REMOTE_URL="git://localhost/test.git"
mkdir _build
cd _build
+# shellcheck disable=SC2086
cmake .. -DCMAKE_INSTALL_PREFIX=../_install $OPTIONS || exit $?
make -j2 install || exit $?
ctest -V . || exit $?
diff --git a/script/coverity.sh b/script/coverity.sh
index e720088..dcfeffc 100755
--- a/script/coverity.sh
+++ b/script/coverity.sh
@@ -13,24 +13,24 @@ then
fi
COV_VERSION=6.6.1
-case `uname -m` in
+case $(uname -m) in
i?86) BITS=32 ;;
amd64|x86_64) BITS=64 ;;
esac
SCAN_TOOL=https://scan.coverity.com/download/linux-${BITS}
-TOOL_BASE=`pwd`/_coverity-scan
+TOOL_BASE=$(pwd)/_coverity-scan
# Install coverity tools
-if [ ! -d $TOOL_BASE ]; then
+if [ ! -d "$TOOL_BASE" ]; then
echo "Downloading coverity..."
- mkdir -p $TOOL_BASE
- cd $TOOL_BASE
+ mkdir -p "$TOOL_BASE"
+ pushd "$TOOL_BASE"
wget -O coverity_tool.tgz $SCAN_TOOL \
--post-data "project=libgit2&token=$COVERITY_TOKEN"
tar xzf coverity_tool.tgz
- cd ..
- TOOL_DIR=`find $TOOL_BASE -type d -name 'cov-analysis*'`
- ln -s $TOOL_DIR $TOOL_BASE/cov-analysis
+ popd
+ TOOL_DIR=$(find "$TOOL_BASE" -type d -name 'cov-analysis*')
+ ln -s "$TOOL_DIR" "$TOOL_BASE"/cov-analysis
fi
COV_BUILD="$TOOL_BASE/cov-analysis/bin/cov-build"
@@ -46,12 +46,12 @@ COVERITY_UNSUPPORTED=1 \
# Upload results
tar czf libgit2.tgz cov-int
-SHA=`git rev-parse --short HEAD`
+SHA=$(git rev-parse --short HEAD)
curl \
--form project=libgit2 \
- --form token=$COVERITY_TOKEN \
+ --form token="$COVERITY_TOKEN" \
--form email=bs@github.com \
--form file=@libgit2.tgz \
- --form version=$SHA \
+ --form version="$SHA" \
--form description="Travis build" \
http://scan5.coverity.com/cgi-bin/upload.py