From: Thanh Ha <zxiiro@gmail.com>
Date: Sat, 11 May 2019 00:25:58 +0000 (-0400)
Subject: Resolve OPFlex ShellCheck issues
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F90%2F81990%2F1;p=releng%2Fbuilder.git

Resolve OPFlex ShellCheck issues

Change-Id: I702d6831c2cc15ad3fa6451efd7d2ba90f2f55b7
Signed-off-by: Thanh Ha <zxiiro@gmail.com>
---

diff --git a/jjb/opflex/scripts/libuv-build.sh b/jjb/opflex/scripts/libuv-build.sh
index eea1beff9..e9b369d1e 100644
--- a/jjb/opflex/scripts/libuv-build.sh
+++ b/jjb/opflex/scripts/libuv-build.sh
@@ -17,11 +17,11 @@ set -x
 ROOT=/tmp/opflex-prefix
 ./configure --prefix=$ROOT
 mkdir install-root
-DESTDIR=`pwd`/install-root make clean install
+DESTDIR=$(pwd)/install-root make clean install
 pushd install-root
-tar -cvzf "libuv-$LIBUV_VERSION.tar.gz" *
+tar -cvzf -- "libuv-$LIBUV_VERSION.tar.gz" *
 # Move tarball to dir of files that will be uploaded to Nexus
 UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
 mkdir -p "$UPLOAD_FILES_PATH"
-mv *.tar.gz "$_"
+mv -- *.tar.gz "$_"
 popd
diff --git a/jjb/opflex/scripts/openvswitch-build.sh b/jjb/opflex/scripts/openvswitch-build.sh
index 2d379c751..b48ff5943 100644
--- a/jjb/opflex/scripts/openvswitch-build.sh
+++ b/jjb/opflex/scripts/openvswitch-build.sh
@@ -23,7 +23,7 @@ mkdir -p "$DESTDIR"
 ./boot.sh
 ./configure --prefix="$ROOT" --enable-shared
 make -j4
-DESTDIR=`pwd`/$DESTDIR make install
+DESTDIR=$(pwd)/$DESTDIR make install
 
 if [[ $OPENVSWITCH_VERSION =~ 2.6.0 ]]; then
     mkdir -p $DESTDIR/$ROOT/include/openvswitch/openvswitch
@@ -36,9 +36,9 @@ elif [[ $OPENVSWITCH_VERSION =~ noiro ]]; then
 fi
 
 pushd $DESTDIR
-tar -cvzf "openvswitch-$OPENVSWITCH_VERSION.tar.gz" *
+tar -cvzf -- "openvswitch-$OPENVSWITCH_VERSION.tar.gz" *
 # Move tarball to dir of files that will be uploaded to Nexus
 UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
 mkdir -p "$UPLOAD_FILES_PATH"
-mv *.tar.gz "$_"
+mv -- *.tar.gz "$_"
 popd
diff --git a/jjb/opflex/scripts/opflex-build.sh b/jjb/opflex/scripts/opflex-build.sh
index ca5a8bf0b..859b1cbe5 100644
--- a/jjb/opflex/scripts/opflex-build.sh
+++ b/jjb/opflex/scripts/opflex-build.sh
@@ -27,13 +27,13 @@ mkdir -p "$ROOT"
 trap cleanup EXIT
 
 # Download the artifacts from nexus thirdparty
-wget -nv ${NEXUS_URL}/service/local/repositories/thirdparty/content/openvswitch/openvswitch/${OPENVSWITCH_VERSION}/openvswitch-${OPENVSWITCH_VERSION}.tar.gz
-wget -nv ${NEXUS_URL}/service/local/repositories/thirdparty/content/rapidjson/rapidjson/${RAPIDJSON_VERSION}/rapidjson-${RAPIDJSON_VERSION}.tar.gz
-wget -nv ${NEXUS_URL}/service/local/repositories/thirdparty/content/libuv/libuv/${LIBUV_VERSION}/libuv-${LIBUV_VERSION}.tar.gz
+wget -nv "${NEXUS_URL}/service/local/repositories/thirdparty/content/openvswitch/openvswitch/${OPENVSWITCH_VERSION}/openvswitch-${OPENVSWITCH_VERSION}.tar.gz"
+wget -nv "${NEXUS_URL}/service/local/repositories/thirdparty/content/rapidjson/rapidjson/${RAPIDJSON_VERSION}/rapidjson-${RAPIDJSON_VERSION}.tar.gz"
+wget -nv "${NEXUS_URL}/service/local/repositories/thirdparty/content/libuv/libuv/${LIBUV_VERSION}/libuv-${LIBUV_VERSION}.tar.gz"
 
-tar -xz -C "$ROOT" --strip-components=2 -f libuv-${LIBUV_VERSION}.tar.gz
-tar -xz -C "$ROOT" --strip-components=2 -f rapidjson-${RAPIDJSON_VERSION}.tar.gz
-tar -xz -C "$ROOT" --strip-components=2 -f openvswitch-${OPENVSWITCH_VERSION}.tar.gz
+tar -xz -C "$ROOT" --strip-components=2 -f "libuv-${LIBUV_VERSION}.tar.gz"
+tar -xz -C "$ROOT" --strip-components=2 -f "rapidjson-${RAPIDJSON_VERSION}.tar.gz"
+tar -xz -C "$ROOT" --strip-components=2 -f "openvswitch-${OPENVSWITCH_VERSION}.tar.gz"
 
 export PATH="$ROOT/bin:$PATH"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ROOT/lib"
@@ -47,14 +47,14 @@ mkdir -p "$UPLOAD_FILES_PATH"
 pushd libopflex
 ./autogen.sh
 ./configure --prefix="$ROOT" \
-    --with-buildversion=$BUILD_NUMBER \
+    --with-buildversion="$BUILD_NUMBER" \
     CPPFLAGS="-isystem $ROOT/include" \
     CXXFLAGS="-Wall"
 make -j4
 if ! make check; then find . -name test-suite.log -exec cat {} \; && false; fi
 make install
 make dist
-mv *.tar.gz "$UPLOAD_FILES_PATH"
+mv -- *.tar.gz "$UPLOAD_FILES_PATH"
 popd
 
 # build libmodelgbp
@@ -66,7 +66,7 @@ bash autogen.sh
 make -j2
 make install
 make dist
-mv *.tar.gz "$UPLOAD_FILES_PATH"
+mv -- *.tar.gz "$UPLOAD_FILES_PATH"
 popd
 popd
 
@@ -74,11 +74,11 @@ popd
 pushd agent-ovs
 ./autogen.sh
 ./configure --prefix="$ROOT" \
-    --with-buildversion=$BUILD_NUMBER \
+    --with-buildversion="$BUILD_NUMBER" \
     CPPFLAGS="-isystem $ROOT/include" \
     CXXFLAGS="-Wall"
 make -j4
 if ! make check; then find . -name test-suite.log -exec cat {} \; && false; fi
 make dist
-mv *.tar.gz "$UPLOAD_FILES_PATH"
+mv -- *.tar.gz "$UPLOAD_FILES_PATH"
 popd
diff --git a/jjb/opflex/scripts/rapidjson-build.sh b/jjb/opflex/scripts/rapidjson-build.sh
index 2ed65604e..f46597a75 100644
--- a/jjb/opflex/scripts/rapidjson-build.sh
+++ b/jjb/opflex/scripts/rapidjson-build.sh
@@ -28,9 +28,9 @@ sed -e "s|@INCLUDE_INSTALL_DIR@|$ROOT/include|" \
     "$DESTDIR/$ROOT/lib/pkgconfig/RapidJSON.pc"
 
 pushd $DESTDIR
-tar -cvzf "rapidjson-$RAPIDJSON_VERSION.tar.gz" *
+tar -cvzf -- "rapidjson-$RAPIDJSON_VERSION.tar.gz" *
 # Move tarball to dir of files that will be uploaded to Nexus
 UPLOAD_FILES_PATH="$WORKSPACE/upload_files"
 mkdir -p "$UPLOAD_FILES_PATH"
-mv *.tar.gz "$_"
+mv -- *.tar.gz "$_"
 popd