From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Wed, 8 Mar 2017 21:43:01 +0000 (-0500)
Subject: Fix ShellCheck issues in jjb/packaging
X-Git-Tag: release/boron-sr3~119^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=3c6f540f614728af6535845bc6d5880301cf20ba;p=releng%2Fbuilder.git

Fix ShellCheck issues in jjb/packaging

Change-Id: I9636f337273ed9ec5ad4bdcb99d9eec5f1d3f6ba
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/jjb/packaging/include-raw-build-deb.sh b/jjb/packaging/include-raw-build-deb.sh
index adb3c3ae0..1aad638df 100644
--- a/jjb/packaging/include-raw-build-deb.sh
+++ b/jjb/packaging/include-raw-build-deb.sh
@@ -17,7 +17,7 @@ sudo apt-get install -y --force-yes \
                     gdebi
 
 # Build release specified by build params
-$WORKSPACE/packaging/deb/build.py --major "$VERSION_MAJOR" \
+"$WORKSPACE/packaging/deb/build.py" --major "$VERSION_MAJOR" \
                                   --minor "$VERSION_MINOR" \
                                   --patch "$VERSION_PATCH" \
                                   --deb "$PKG_VERSION" \
diff --git a/jjb/packaging/include-raw-build-rpm-snap.sh b/jjb/packaging/include-raw-build-rpm-snap.sh
index 0a2a6ddf6..67ccc8eee 100644
--- a/jjb/packaging/include-raw-build-rpm-snap.sh
+++ b/jjb/packaging/include-raw-build-rpm-snap.sh
@@ -8,12 +8,13 @@ set -ex -o pipefail
 
 # Install required packages
 virtualenv rpm_build
+# shellcheck disable=SC1091
 source rpm_build/bin/activate
 pip install --upgrade pip
-pip install -r $WORKSPACE/packaging/rpm/requirements.txt
+pip install -r "$WORKSPACE/packaging/rpm/requirements.txt"
 
 # Build the latest snapshot matching the given major minor version
-$WORKSPACE/packaging/rpm/build.py --build-latest-snap \
+"$WORKSPACE/packaging/rpm/build.py" --build-latest-snap \
                                   --major "$VERSION_MAJOR" \
                                   --minor "$VERSION_MINOR" \
                                   --sysd_commit "$SYSD_COMMIT" \
diff --git a/jjb/packaging/include-raw-build-rpm.sh b/jjb/packaging/include-raw-build-rpm.sh
index ab788d91b..74a752138 100644
--- a/jjb/packaging/include-raw-build-rpm.sh
+++ b/jjb/packaging/include-raw-build-rpm.sh
@@ -8,15 +8,17 @@ set -ex -o pipefail
 
 # Install required packages
 virtualenv rpm_build
+# shellcheck disable=SC1091
 source rpm_build/bin/activate
 pip install --upgrade pip
-pip install -r $WORKSPACE/packaging/rpm/requirements.txt
+pip install -r "$WORKSPACE/packaging/rpm/requirements.txt"
 
 # Make a URL for the tarball artifact from DOWNLOAD_URL (a zip)
+# shellcheck disable=SC2154
 download_url="${{DOWNLOAD_URL//zip/tar.gz}}"
 
 # Build release specified by build params
-$WORKSPACE/packaging/rpm/build.py --download_url "$download_url" \
+"$WORKSPACE/packaging/rpm/build.py" --download_url "$download_url" \
                                   --sysd_commit "$SYSD_COMMIT" \
                                   --changelog_date "$CHANGELOG_DATE" \
                                   --changelog_name "$CHANGELOG_NAME" \
diff --git a/jjb/packaging/include-raw-test-puppet.sh b/jjb/packaging/include-raw-test-puppet.sh
index d79bd1c19..cb015679b 100644
--- a/jjb/packaging/include-raw-test-puppet.sh
+++ b/jjb/packaging/include-raw-test-puppet.sh
@@ -10,7 +10,7 @@ set -ex -o pipefail
 # https://github.com/dfarrell07/puppet-opendaylight/blob/master/Vagrantfile
 
 # Update Int/Pack's puppet-opendaylight submodule to latest master
-pushd $WORKSPACE/packaging
+pushd "$WORKSPACE/packaging"
 git submodule init
 git submodule update --remote
 
@@ -22,7 +22,8 @@ sudo yum install -y ruby-devel gcc-c++ zlib-devel patch redhat-rpm-config make r
 gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
 curl -L get.rvm.io | bash -s stable
 # Expected by RVM, seems required to make RVM functions (`rvm use`) available
-source $HOME/.rvm/scripts/rvm
+# shellcheck disable=SC1090
+source "$HOME/.rvm/scripts/rvm"
 rvm install 2.4.0
 ruby --version
 # This has to be done as a login shell to get rvm fns
@@ -33,8 +34,8 @@ ruby --version
 
 # Install gems dependencies of puppet-opendaylight via Bundler
 gem install bundler
-echo export PATH=\\$PATH:/usr/local/bin >> $HOME/.bashrc
-pushd $WORKSPACE/packaging/puppet/puppet-opendaylight
+echo export PATH="\\$PATH:/usr/local/bin" >> "$HOME/.bashrc"
+pushd "$WORKSPACE/packaging/puppet/puppet-opendaylight"
 bundle install
 bundle update