Fix ShellCheck issues in jenkins-scripts

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

diff --git a/jenkins-scripts/create_jenkins_user.sh b/jenkins-scripts/create_jenkins_user.sh
index b9b7a9f774ecd0af25019250b9b91057ea1904d1..89ffd2da62b8fa3da8f76e8357249e6f92397ec3 100755 (executable)
--- a/jenkins-scripts/create_jenkins_user.sh
+++ b/jenkins-scripts/create_jenkins_user.sh
@@ -9,24 +9,22 @@ OS=$(facter operatingsystem | tr '[:upper:]' '[:lower:]')
 useradd -m -s /bin/bash jenkins
 
 # Check if docker group exists
-grep -q docker /etc/group
-if [ "$?" == '0' ]
+if grep -q docker /etc/group
 then
-  # Add jenkins user to docker group
-  usermod -a -G docker jenkins
+    # Add jenkins user to docker group
+    usermod -a -G docker jenkins
 fi
 
 # Check if mock group exists
-grep -q mock /etc/group
-if [ "$?" == '0' ]
+if grep -q mock /etc/group
 then
-  # Add jenkins user to mock group so they can build Int/Pack's RPMs
-  usermod -a -G mock jenkins
+    # Add jenkins user to mock group so they can build Int/Pack's RPMs
+    usermod -a -G mock jenkins
 fi
 
 mkdir /home/jenkins/.ssh
 mkdir /w
-cp -r /home/${OS}/.ssh/authorized_keys /home/jenkins/.ssh/authorized_keys
+cp -r "/home/${OS}/.ssh/authorized_keys" /home/jenkins/.ssh/authorized_keys
 # Generate ssh key for use by Robot jobs
 echo -e 'y\n' | ssh-keygen -N "" -f /home/jenkins/.ssh/id_rsa -t rsa
 chown -R jenkins:jenkins /home/jenkins/.ssh /w

diff --git a/jenkins-scripts/disable_firewall.sh b/jenkins-scripts/disable_firewall.sh
index 032c63d93643372fb33952587c6fa8a108aabeeb..f7791227db983e1983ef81d81c820fe9cc8cdb39 100755 (executable)
--- a/jenkins-scripts/disable_firewall.sh
+++ b/jenkins-scripts/disable_firewall.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-OS=`facter operatingsystem`
+OS=$(facter operatingsystem)
 
 case "$OS" in
     Fedora)
         systemctl stop firewalld
     ;;
     CentOS|RedHat)
-        if [ `facter operatingsystemrelease | cut -d '.' -f1` -lt "7" ]; then
+        if [ "$(facter operatingsystemrelease | cut -d '.' -f1)" -lt "7" ]; then
             service iptables stop
         else
             systemctl stop firewalld

diff --git a/jenkins-scripts/docker.sh b/jenkins-scripts/docker.sh
index d8a2ed5bef50d79b5bf714e31e8f538991e26257..d8963184cb5017fc49366cdeb0968e4f6bfa821c 100755 (executable)
--- a/jenkins-scripts/docker.sh
+++ b/jenkins-scripts/docker.sh
@@ -8,8 +8,8 @@ EOF
 
 # make sure jenkins is part of the docker only if jenkins has already been
 # created
-grep -q jenkins /etc/passwd
-if [ "$?" == '0' ]
+
+if grep -q jenkins /etc/passwd
 then
   /usr/sbin/usermod -a -G docker jenkins
 fi

diff --git a/jenkins-scripts/jenkins-init-script.sh b/jenkins-scripts/jenkins-init-script.sh
index efb8b1a79733a57fb878c801b71d453e9ddc6053..fc55c89c747ad77f3d8bc4763a3e5e9116fcfd63 100755 (executable)
--- a/jenkins-scripts/jenkins-init-script.sh
+++ b/jenkins-scripts/jenkins-init-script.sh
@@ -9,13 +9,14 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-cd /builder/jenkins-scripts
-chmod +x *.sh
+cd /builder/jenkins-scripts || exit 404
+chmod +x -- *.sh
 ./system_type.sh
 
+# shellcheck disable=SC1091
 source /tmp/system_type.sh
 ./basic_settings.sh
-./${SYSTEM_TYPE}.sh
+"./${SYSTEM_TYPE}.sh"
 
 # Create the jenkins user last so that hopefully we don't have to deal with
 # guard files