diff options
| -rwxr-xr-x | scripts/box/create-backup.env.sh | 2 | ||||
| -rwxr-xr-x | scripts/box/restore-backup.env.sh | 4 | ||||
| -rwxr-xr-x | scripts/ci/provision.sh | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/scripts/box/create-backup.env.sh b/scripts/box/create-backup.env.sh index c9b2d3d..b87df38 100755 --- a/scripts/box/create-backup.env.sh +++ b/scripts/box/create-backup.env.sh @@ -11,4 +11,4 @@ borg create \ --progress \ --compression lzma,6 \ "${BORG_REPO}::{hostname}-{now}-${VPS_COMMIT_SHA}" \ - ${VOLUME_HOME}/* + "${VOLUME_HOME}"/* diff --git a/scripts/box/restore-backup.env.sh b/scripts/box/restore-backup.env.sh index b12d4f0..14d462d 100755 --- a/scripts/box/restore-backup.env.sh +++ b/scripts/box/restore-backup.env.sh @@ -3,7 +3,7 @@ export BORG_REMOTE_PATH="${BORG_REMOTE_PATH}" export BORG_PASSPHRASE="${BORG_PASSPHRASE}" -pushd "$(mktemp -d)" +pushd "$(mktemp -d)" || exit 1 ARCHIVE="$(borg list "${BORG_REPO}" --last 1 --short)" echo "Extracting archive ${ARCHIVE}" @@ -15,4 +15,4 @@ borg extract \ echo "Done." mv home/vps/volumes/* /home/vps/volumes/ -popd +popd || exit 1 diff --git a/scripts/ci/provision.sh b/scripts/ci/provision.sh index 232cb93..a56d9f6 100755 --- a/scripts/ci/provision.sh +++ b/scripts/ci/provision.sh @@ -15,7 +15,9 @@ setup_borg_files() { scp ./secrets/borg/borg-remote "$TLD":/root/.ssh/id_rsa scp ./secrets/borg/known-hosts.txt "$TLD":/root/.ssh/known_hosts ssh "$TLD" 'chmod 400 /root/.ssh/id_rsa' + # shellcheck disable=SC2029 envsubst < "${template_file}" | ssh "$TLD" "cat > /home/vps/${destination_name} && chmod +x /home/vps/${destination_name}" + # shellcheck disable=SC2029 ssh "$TLD" "chmod +x /home/vps/${destination_name}" } |