From 4080d8bbe1906a49d9e1792ffa7824c160b428bf Mon Sep 17 00:00:00 2001 From: Tim Landscheidt Date: Apr 02 2025 15:56:33 +0000 Subject: Fix ShellCheck warnings for rpmdev-setuptree --- diff --git a/rpmdev-setuptree b/rpmdev-setuptree index 83cf94e..b54338d 100755 --- a/rpmdev-setuptree +++ b/rpmdev-setuptree @@ -16,18 +16,18 @@ # copyright (c) 2002 Owl River Company - Columbus OH # info@owlriver.com -- GPL v.2 # -[ "x$1" = "x-d" ] && { +[ "$1" = "-d" ] && { DEBUG="y" export DEBUG shift 1 } # -IAM=`id -un` +IAM="$(id -un)" # returns bare username # -PASSWDDIR=`grep ^$IAM: /etc/passwd | awk -F":" '{print $6}'` -HOMEDIR=${HOME:=$PASSWDDIR} -[ ! -d $HOMEDIR ] && { +PASSWDDIR="$(getent passwd "$IAM" | awk -F":" '{print $6}')" +HOMEDIR="${HOME:=$PASSWDDIR}" +[ ! -d "$HOMEDIR" ] && { echo "ERROR: Home directory for user $IAM not found in /etc/passwd." exit 1 } @@ -36,29 +36,27 @@ HOMEDIR=${HOME:=$PASSWDDIR} # # RPMMACROS="$HOMEDIR/.rpmmacros" -touch $RPMMACROS +touch "$RPMMACROS" # -TOPDIR="%_topdir" -ISTOP=`grep -c ^$TOPDIR $RPMMACROS` -[ $ISTOP -lt 1 ] && { - cat <<\EOF >> $RPMMACROS +if ! grep -q '^%_topdir' "$RPMMACROS"; then + cat <<\EOF >> "$RPMMACROS" %_topdir %(echo $HOME)/rpmbuild EOF -} -RPMDIR=`rpm --eval "%{_rpmdir}"` -SRCDIR=`rpm --eval "%{_sourcedir}"` -SPECDIR=`rpm --eval "%{_specdir}"` -SRPMDIR=`rpm --eval "%{_srcrpmdir}"` -BUILDDIR=`rpm --eval "%{_builddir}"` +fi +RPMDIR="$(rpm --eval '%{_rpmdir}')" +SRCDIR="$(rpm --eval '%{_sourcedir}')" +SPECDIR="$(rpm --eval '%{_specdir}')" +SRPMDIR="$(rpm --eval '%{_srcrpmdir}')" +BUILDDIR="$(rpm --eval '%{_builddir}')" [ "x$DEBUG" != "x" ] && { echo "$IAM $HOMEDIR $RPMMACROS" echo "$RPMDIR $SRCDIR $SPECDIR" echo "$SRPMDIR $BUILDDIR" } # -for i in $RPMDIR $SRCDIR $SPECDIR $SRPMDIR $BUILDDIR ; do - [ ! -d $i ] && mkdir -p $i +for i in "$RPMDIR" "$SRCDIR" "$SPECDIR" "$SRPMDIR" "$BUILDDIR" ; do + [ ! -d "$i" ] && mkdir -p "$i" done # exit 0