Skip to content

Commit 9c1dc0a

Browse files
authored
Merge pull request #489 from github/enterprise-3.9-backport-486-fix-es-backup-failures
Backport 486 for 3.9: Remove "exit on error" mode from helper script track-progress
2 parents bf32975 + 7e69fc3 commit 9c1dc0a

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

share/github-backup-utils/track-progress

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/usr/bin/env bash
22
#/ track-progress: track progress of backup or restore tasks
3-
set -e
43

54
# Current version is working solely with backups
65
progress(){

test/test-shellcheck.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ begin_test "shellopts: set -e set on all scripts"
4949
# Check all executable scripts checked into the repo, except bm.sh, ghe-backup-config, ghe-rsync and the dummy test scripts
5050
set +x
5151
cd $BASE_PATH
52-
git ls-tree -r HEAD | grep -Ev 'bm.sh|ghe-backup-config|ghe-rsync|test/bin' | grep -E '^1007|.*\..*sh$' | awk '{print $4}' | while read -r script; do
52+
git ls-tree -r HEAD | grep -Ev 'bm.sh|ghe-backup-config|ghe-rsync|track-progress|test/bin' | grep -E '^1007|.*\..*sh$' | awk '{print $4}' | while read -r script; do
5353
if head -n1 "$script" | grep -E -w "sh|bash" >/dev/null 2>&1; then
5454
grep -q "set -e" $script || echo $script >> $results || true
5555
fi

0 commit comments

Comments
 (0)