Mirrors/ctf-tools
2
0
Fork 0
mirror of https://github.com/zardus/ctf-tools synced 2025-03-17 23:26:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

manage-tools: do error handling for install-root-* scripts the same way as for install scripts

Browse source
This commit is contained in:
Michael Rodler 2018-04-20 15:09:21 +02:00 • committed by Yan
parent 09d49d8bd6
commit da6c5a937b
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bin/manage-tools
View file

@ -374,9 +374,19 @@ case $ACTION in
INSTALL_ROOT_SCRIPT="./install-root-debian"
fi
if [[ -x "$INSTALL_ROOT_SCRIPT" && "$ALLOW_SUDO" -eq 1 ]]; then
if ! sudo env DISTRI=$DISTRI "$INSTALL_ROOT_SCRIPT" >> install.log 2>&1;
then
tool_log "INSTALL FAILED"
set +e
if [[ "$VERBOSE_OUTPUT" -eq 1 ]]; then
sudo env DISTRI=$DISTRI "$INSTALL_ROOT_SCRIPT" 2>&1 | tee -a install.log
else
sudo env DISTRI=$DISTRI "$INSTALL_ROOT_SCRIPT" >> install.log 2>&1
fi
INSTALL_FAILED=$?
set -e
if [[ "$INSTALL_FAILED" -eq 0 ]]; then
tool_log "system dependencies installed"
else
tool_log "INSTALL FAILED: $INSTALL_ROOT_SCRIPT failed to install dependencies"
cat install.log >&2
exit 1
fi