diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2014-11-21 10:59:20 -0500 |
---|---|---|
committer | Edward Thomson <ethomson@edwardthomson.com> | 2014-11-21 10:59:20 -0500 |
commit | 6f4461763eb0518112d22c3a096417e7eedf7385 (patch) | |
tree | 486d54fb5210172f34aa70f002799700e764929f /script | |
parent | deadc43e1d6eeb23645d5503b3084846a42d92dd (diff) | |
parent | a4fccbbf9d534daba7be11d9f1e0762df939dab8 (diff) | |
download | libgit2-6f4461763eb0518112d22c3a096417e7eedf7385.tar.gz |
Merge pull request #2710 from Therzok/shellcheckScripts
Run shell scripts through shellcheck
Diffstat (limited to 'script')
-rwxr-xr-x | script/cibuild.sh | 7 | ||||
-rwxr-xr-x | script/coverity.sh | 22 |
2 files changed, 15 insertions, 14 deletions
diff --git a/script/cibuild.sh b/script/cibuild.sh index 55111b925..8983dcce0 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 e72008883..dcfeffc1d 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 |