summaryrefslogtreecommitdiff
path: root/adelie-build-cd
diff options
context:
space:
mode:
authorCyberLeo <cyberleo@cyberleo.net>2020-03-30 07:59:12 -0500
committerCyberLeo <cyberleo@cyberleo.net>2020-03-30 08:00:17 -0500
commit3fb12f36c8136c7abd998322d900d6e01214e4dc (patch)
tree7ab5201eac117a0842e3a9ce35eabc9870d5b688 /adelie-build-cd
parentbd4a68aef064d0f375f17b4f0988688da30b884d (diff)
downloadimage-3fb12f36c8136c7abd998322d900d6e01214e4dc.tar.gz
image-3fb12f36c8136c7abd998322d900d6e01214e4dc.tar.bz2
image-3fb12f36c8136c7abd998322d900d6e01214e4dc.tar.xz
image-3fb12f36c8136c7abd998322d900d6e01214e4dc.zip
Avoid system cache if specified arch differs from host arch
Diffstat (limited to 'adelie-build-cd')
-rwxr-xr-xadelie-build-cd5
1 files changed, 3 insertions, 2 deletions
diff --git a/adelie-build-cd b/adelie-build-cd
index acd6530..f7d97a0 100755
--- a/adelie-build-cd
+++ b/adelie-build-cd
@@ -74,8 +74,6 @@ usage() {
printf 'Valid phases: clean install initrd iso all\n'
}
-[ -d /etc/apk/cache ] && def_cache=/etc/apk/cache
-
while [ -n "$1" ]; do
case $1 in
-a | --arch)
@@ -119,6 +117,9 @@ while [ -n "$1" ]; do
shift
done
+[ -d /etc/apk/cache ] && def_cache=/etc/apk/cache
+[ -z "${MY_ARCH}" -o "${MY_ARCH}" = "${def_arch}" ] || unset def_cache
+
set -a
readonly ARCH=${MY_ARCH:-$def_arch}
readonly KIND=${MY_KIND:-live}