From 52391ba63dbaa6f40f08a8eb5a044b414f6fc829 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Mon, 8 Aug 2022 21:39:34 -0300
Subject: [PATCH] qi: Prefix 'srcdir' with TMPDIR to simplify code
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Thanks to DustDFG.

Signed-off-by: Matías Fonzo <selk@dragora.org>
---
 qi/src/qi.in | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/qi/src/qi.in b/qi/src/qi.in
index e95f1a38..3a6dd3ed 100644
--- a/qi/src/qi.in
+++ b/qi/src/qi.in
@@ -321,6 +321,7 @@ mode_build()
     pkgname="${pkgname:=$program}"
     pkgversion="${pkgversion:=$version}"
     srcdir="${srcdir:=${program}-$version}"
+    srcdir="${TMPDIR}/$srcdir"
     destdir="${destdir:=${TMPDIR}/package-$pkgname}"
 
     # If 'pkgcategory' has been defined, prefix it using the "at" symbol
@@ -482,10 +483,10 @@ mode_build()
 
     if test -z "$keep_srcdir"
     then
-        if test -e "${TMPDIR}/$srcdir"
+        if test -e "$srcdir"
         then
-            rm -rf -- "${TMPDIR:?}/$srcdir" || chkstatus_or_exit
-            echo "removed directory: '${TMPDIR}/$srcdir'"
+            rm -rf -- "$srcdir" || chkstatus_or_exit
+            echo "removed directory: '$srcdir'"
         fi
     else
         warn \
@@ -631,11 +632,10 @@ mode_build()
     then
         if test -z "$keep_srcdir"
         then
-            srcdir="${srcdir%%/*}";	# Directory name without parents.
-            if test -e "${TMPDIR}/$srcdir"
+            if test -e "$srcdir"
             then
-                rm -rf -- "${TMPDIR:?}/$srcdir" || chkstatus_or_exit
-                echo "removed directory: '${TMPDIR}/$srcdir'"
+                rm -rf -- "$srcdir" || chkstatus_or_exit
+                echo "removed directory: '$srcdir'"
             fi
         fi
         if test -z "$keep_destdir"
@@ -649,7 +649,7 @@ mode_build()
     else
         warn \
          "    The following directories will be preserved:"  \
-         "${TMPDIR}/$srcdir"                                 \
+         "$srcdir"                                           \
          "$destdir"                                          \
          ""                                                  \
          "The '--keep' option has been used."
-- 
2.11.4.GIT