From 59aa1ab111bc8489684ef204c64e7e35c76e9cec Mon Sep 17 00:00:00 2001
From: Richard Mortier <mort@cantab.net>
Date: Fri, 3 May 2019 14:41:09 +0100
Subject: dabuild: fix script to handle `DABUILD_PACKAGES` correctly

---
 dabuild.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dabuild.in b/dabuild.in
index 25dd6dd..793e3c4 100755
--- a/dabuild.in
+++ b/dabuild.in
@@ -41,6 +41,8 @@ else
 fi
 
 ## check $DABUILD_PACKAGES is a writable directory
+DABUILD_PACKAGES=${DABUILD_PACKAGES:-${PWD%/aports*}/packages}
+
 if [ ! \( -d "$DABUILD_PACKAGES" -a -w "$DABUILD_PACKAGES" \) ]; then
   die "Error: invalid packages directory specified!" \
       "DABUILD_PACKAGES = '$DABUILD_PACKAGES'"
@@ -50,7 +52,7 @@ fi
 ABUILD_VOLUMES="
     -v ${HOME}/.abuild:/home/builder/.abuild
     -v ${PWD%/aports*}/aports:/home/builder/aports
-    -v ${DABUILD_PACKAGES:-${PWD%/aports*}/packages}:/home/builder/packages
+    -v ${DABUILD_PACKAGES}:/home/builder/packages
 "
 if [ "$DABUILD_CACHE" = "true" ]; then
   for v in %%ABUILD_VOLUMES%% ; do
-- 
cgit v1.2.3