| index : docker | |
| Archlinux32 docker scripts | gitolite user |
| summaryrefslogtreecommitdiff |
| -rwxr-xr-x | mkimage-arch.sh | 14 |
diff --git a/mkimage-arch.sh b/mkimage-arch.sh index 6d43e98..9e13cf6 100755 --- a/mkimage-arch.sh +++ b/mkimage-arch.sh @@ -55,11 +55,8 @@ unset IFS arch="$(uname -m)" case "$arch" in armv*) - if pacman -Q archlinuxarm-keyring >/dev/null 2>&1; then - pacman-key --init - pacman-key --populate archlinuxarm - else - echo "Could not find archlinuxarm-keyring. Please, install it and run pacman-key --populate archlinuxarm" + if ! pacman -Q archlinuxarm-keyring >/dev/null 2>&1; then + echo "Could not find archlinuxarm-keyring. Please, install it" exit 1 fi PACMAN_CONF=$(mktemp ${TMPDIR:-/var/tmp}/pacman-conf-archlinux-XXXXXXXXX) @@ -72,11 +69,8 @@ case "$arch" in DOCKER_IMAGE_NAME="armv${version}h/archlinux" ;; *) - if pacman -Q archlinux32-keyring >/dev/null 2>&1; then - pacman-key --init - pacman-key --populate archlinux32 - else - echo "Could not find archlinux32-keyring. Please, install it and run pacman-key --populate archlinux32" + if ! pacman -Q archlinux32-keyring >/dev/null 2>&1; then + echo "Could not find archlinux32-keyring. Please, install it" exit 1 fi PACMAN_CONF=$(mktemp ${TMPDIR:-/var/tmp}/pacman-conf-archlinux-XXXXXXXXX) |