Merge "Update CentOS7 images for change 56476"

[releng/builder.git] / jenkins-scripts / create_jenkins_user.sh

diff --git a/jenkins-scripts/create_jenkins_user.sh b/jenkins-scripts/create_jenkins_user.sh
index b9b7a9f774ecd0af25019250b9b91057ea1904d1..6af25dfecbfa2c9099083ccf7a30ac3ad43c1045 100755 (executable)
--- a/jenkins-scripts/create_jenkins_user.sh
+++ b/jenkins-scripts/create_jenkins_user.sh
@@ -9,24 +9,23 @@ 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
+chmod 700 /home/jenkins/.ssh