mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
simplify abort in script
This commit is contained in:
parent
85f4039d52
commit
4d25b35b8b
2 changed files with 2 additions and 4 deletions
|
@ -63,7 +63,7 @@ chgrp "${_GROUP}" ${_PACMAN_AARCH64_CHROOT}{,.sig}
|
||||||
sudo -u "${_USER}" scp ${_PACMAN_AARCH64_CHROOT}{,.sig} ${_SERVER}:${_PACMAN_AARCH_SERVERDIR} || exit 1
|
sudo -u "${_USER}" scp ${_PACMAN_AARCH64_CHROOT}{,.sig} ${_SERVER}:${_PACMAN_AARCH_SERVERDIR} || exit 1
|
||||||
# create release in "${_ISODIR}"
|
# create release in "${_ISODIR}"
|
||||||
cd "${_ISODIR}" || exit 1
|
cd "${_ISODIR}" || exit 1
|
||||||
"archboot-${_ARCH}-release.sh" "${_BUILDDIR}" || (rm -r "${_BUILDDIR}"; exit 1)
|
"archboot-${_ARCH}-release.sh" "${_BUILDDIR}" || rm -r "${_BUILDDIR}"
|
||||||
# set user rights on files
|
# set user rights on files
|
||||||
# set user rights on files
|
# set user rights on files
|
||||||
[[ -d "${_BUILDDIR}" ]] && exit 1
|
[[ -d "${_BUILDDIR}" ]] && exit 1
|
||||||
|
|
|
@ -32,9 +32,7 @@ cp "${_PACMAN_MIRROR}" "${_PACMAN_MIRROR}".old
|
||||||
cp "${_PACMAN_MIRROR}".archboot "${_PACMAN_MIRROR}"
|
cp "${_PACMAN_MIRROR}".archboot "${_PACMAN_MIRROR}"
|
||||||
# create release in "${_ISODIR}"
|
# create release in "${_ISODIR}"
|
||||||
cd "${_ISODIR}" || exit 1
|
cd "${_ISODIR}" || exit 1
|
||||||
"archboot-${_ARCH}-release.sh" "${_BUILDDIR}" ||\
|
"archboot-${_ARCH}-release.sh" "${_BUILDDIR}" ||rm -r "${_BUILDDIR}"
|
||||||
(rm -r "${_BUILDDIR}"; cp "${_PACMAN_MIRROR}".old "${_PACMAN_MIRROR}";\
|
|
||||||
cp "${_PACMAN_CONF}".old "${_PACMAN_CONF}"; exit 1)
|
|
||||||
# restore pacman.conf and mirrorlist
|
# restore pacman.conf and mirrorlist
|
||||||
cp "${_PACMAN_MIRROR}".old "${_PACMAN_MIRROR}"
|
cp "${_PACMAN_MIRROR}".old "${_PACMAN_MIRROR}"
|
||||||
cp "${_PACMAN_CONF}".old "${_PACMAN_CONF}"
|
cp "${_PACMAN_CONF}".old "${_PACMAN_CONF}"
|
||||||
|
|
Loading…
Reference in a new issue