diff options
| author | Richard Mortier <mort@cantab.net> | 2019-05-03 14:41:09 +0100 |
|---|---|---|
| committer | Richard Mortier <mort@cantab.net> | 2019-05-03 14:41:09 +0100 |
| commit | 59aa1ab111bc8489684ef204c64e7e35c76e9cec (patch) | |
| tree | 8b9f45e7d23f7271cecb10e6c0beda24177e5858 | |
| parent | 32cb2383b418e2c22184967ebfa6794ac5a3cf39 (diff) | |
| download | docker-abuild-59aa1ab111bc8489684ef204c64e7e35c76e9cec.tar.bz2 docker-abuild-59aa1ab111bc8489684ef204c64e7e35c76e9cec.tar.xz | |
dabuild: fix script to handle `DABUILD_PACKAGES` correctly
| -rwxr-xr-x | dabuild.in | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 |
