Chore: Upgrade Jenkins-job-builder to 6.3.0

[releng/global-jjb.git] / shell / sudo-logs.sh

diff --git a/shell/sudo-logs.sh b/shell/sudo-logs.sh
index d925434..ccc7fb3 100755 (executable)
--- a/shell/sudo-logs.sh
+++ b/shell/sudo-logs.sh
@@ -13,28 +13,27 @@ echo "---> sudo-logs.sh"
 set -eu -o pipefail -o noglob
 
 # Copy/Generate 'sudo' log and copy to archive directory
-function copy_log()
-{
+copy_log () {
     case $os in
         fedora|centos|redhat|ubuntu|debian)
-            if ! sudo cp $sudo_log /tmp; then
+            if ! sudo cp "$sudo_log" /tmp; then
                 echo "Unable to archive 'sudo' logs ($sudo_log)"
                 return
             fi
             ;;
         suse)
             # Do I need 'sudo' to run 'journalctl'?
-            journalctl | grep sudo > $sudo_log
+            journalctl | grep sudo > "$sudo_log"
             ;;
         *)  echo "Unexpected 'operatingsystem': $os"
             exit 1
             ;;
     esac
-    sudo_log=$(basename $sudo_log)
-    sudo chown jenkins:jenkins /tmp/$sudo_log
-    chmod 0644 /tmp/$sudo_log
-    mkdir -p $WORKSPACE/archives/sudo
-    mv /tmp/$sudo_log $WORKSPACE/archives/sudo/$sudo_log
+    sudo_log=$(basename "$sudo_log")
+    sudo chown "$(id -nu)": "/tmp/$sudo_log"
+    chmod 0644 "/tmp/$sudo_log"
+    mkdir -p "$WORKSPACE/archives/sudo"
+    mv "/tmp/$sudo_log" "$WORKSPACE/archives/sudo/$sudo_log"
 
 }    # End copy_log()