X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fsudo-logs.sh;h=ccc7fb35e93f04fac4731b1e314a5ca380e92875;hb=04853ec1c27444d494afae28e8c181b711280f4b;hp=d925434f8566bf1fe9754e4590fa54a5b9463f12;hpb=ca1763c074a62c626b76e21886347dcffbf15dcd;p=releng%2Fglobal-jjb.git diff --git a/shell/sudo-logs.sh b/shell/sudo-logs.sh index d925434f..ccc7fb35 100755 --- 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()