From a2b1520175aa9479f6e84c44fb5c2ed61ef5034e Mon Sep 17 00:00:00 2001 From: Tim Landscheidt Date: Apr 02 2025 14:12:57 +0000 Subject: Fix ShellCheck warnings for rpmdev-wipetree --- diff --git a/rpmdev-wipetree b/rpmdev-wipetree index 56229fa..37f7296 100755 --- a/rpmdev-wipetree +++ b/rpmdev-wipetree @@ -20,7 +20,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Sanity Check: Forbid root user -if [ $(id -u) -eq 0 ]; then +if [ "$(id -u)" -eq 0 ]; then echo echo "ERROR: You should not be building RPMS as the superuser!" echo "Please use rpmdev-setuptree as a normal user and build" @@ -35,14 +35,15 @@ if [ $# -gt 0 ]; then echo echo "Usage: rpmdev-wipetree" rc=1 - [ "$1" = "-h" -o "$1" = "--help" ] && rc=0 + [ "$1" = "-h" ] || [ "$1" = "--help" ] && rc=0 exit $rc fi # Wipe RPM Build Directory clean echo "Removing all build files..." -rm -rf $(rpm --eval "%{_builddir}")/* -rm -rf $(rpm --eval "%{_sourcedir}")/* -rm -rf $(rpm --eval "%{_srcrpmdir}")/* -rm -rf $(rpm --eval "%{_specdir}")/* -find $(rpm --eval "%{_rpmdir}") -name "*.rpm" | xargs rm -f + +d="$(rpm --eval '%{_builddir}')" && rm -rf "${d:?}"/* +d="$(rpm --eval '%{_sourcedir}')" && rm -rf "${d:?}"/* +d="$(rpm --eval '%{_srcrpmdir}')" && rm -rf "${d:?}"/* +d="$(rpm --eval '%{_specdir}')" && rm -rf "${d:?}"/* +d="$(rpm --eval '%{_rpmdir}')" && find "${d:?}" -type f -name '*.rpm' -delete