diff options
| author | nachoparker <nacho@ownyourbits.com> | 2018-05-11 13:50:28 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2018-05-11 14:32:41 +0300 |
| commit | 2ef575c1ee94a4aa58a2a67c5e532d24db409e13 (patch) | |
| tree | b5d1af3853e6359c4988b01733e57ca8b5ceb1fd /etc | |
| parent | b93aec5adc59fb9411766bf324db74853fe271cd (diff) | |
nc-restore: make more robust to unexpected failurev0.54.10
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ncp-config.d/nc-restore.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/etc/ncp-config.d/nc-restore.sh b/etc/ncp-config.d/nc-restore.sh index d17a4dfa..17d8ada5 100644 --- a/etc/ncp-config.d/nc-restore.sh +++ b/etc/ncp-config.d/nc-restore.sh @@ -31,16 +31,20 @@ install() { cat > /usr/local/bin/ncp-restore <<'EOF' #!/bin/bash +set -e BACKUPFILE="$1" DBADMIN=ncadmin -DBPASSWD=$( grep password /root/.my.cnf | sed 's|password=||' ) +DBPASSWD="$( grep password /root/.my.cnf | sed 's|password=||' )" -[ -f $BACKUPFILE ] || { echo "$BACKUPFILE not found"; exit 1; } -[ -d /var/www/nextcloud ] && { echo "INFO: overwriting old instance" ; } +[ $# -eq 0 ] && { echo "missing first argument"; exit 1; } +[ -f "$BACKUPFILE" ] || { echo "$BACKUPFILE not found" ; exit 1; } +[ -d /var/www/nextcloud ] && { echo "INFO: overwriting old instance"; } -TMPDIR="$( dirname $BACKUPFILE )/$( basename ${BACKUPFILE}-tmp )" +TMPDIR="$( mktemp -d "$( dirname $BACKUPFILE )"/ncp-restore.XXXXXX )" || { echo "Failed to create temp dir" >&2; exit 1; } +cleanup(){ local RET=$?; echo "Cleanup..."; rm -rf "${TMPDIR}"; exit $RET; } +trap cleanup INT TERM HUP EXIT rm -rf "$TMPDIR" && mkdir -p "$TMPDIR" # EXTRACT FILES @@ -154,8 +158,6 @@ pgrep fail2ban &>/dev/null && service fail2ban restart # refresh nextcloud trusted domains bash /usr/local/bin/nextcloud-domain.sh - -rm -r "$TMPDIR" EOF chmod +x /usr/local/bin/ncp-restore } |