add other exit check in server script

This commit is contained in:
Tobias Powalowski 2022-02-02 14:05:29 +01:00
parent 5efc7bb6a6
commit fc8462fb4b
2 changed files with 5 additions and 3 deletions

View file

@ -63,9 +63,10 @@ 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}"; exit 1)
# set user rights on files # set user rights on files
# set user rights on files # set user rights on files
[[ -d "${_BUILDDIR}" ]] && exit 1
chmod 755 "${_BUILDDIR}" chmod 755 "${_BUILDDIR}"
chown -R "${_USER}" "${_BUILDDIR}" chown -R "${_USER}" "${_BUILDDIR}"
chgrp -R "${_GROUP}" "${_BUILDDIR}" chgrp -R "${_GROUP}" "${_BUILDDIR}"

View file

@ -32,13 +32,14 @@ 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}"; cp "${_PACMAN_MIRROR}".old "${_PACMAN_MIRROR}";\ rm -r "${_BUILDDIR}"; cp "${_PACMAN_MIRROR}".old "${_PACMAN_MIRROR}";\
cp "${_PACMAN_CONF}".old "${_PACMAN_CONF}"; exit 1 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}"
# set user rights on files # set user rights on files
[[ -d "${_BUILDDIR}" ]] && exit 1
chmod 755 "${_BUILDDIR}" chmod 755 "${_BUILDDIR}"
chown -R "${_USER}" "${_BUILDDIR}" chown -R "${_USER}" "${_BUILDDIR}"
chgrp -R "${_GROUP}" "${_BUILDDIR}" chgrp -R "${_GROUP}" "${_BUILDDIR}"