Merge pull request #874 from github/hao/trap-int-backup-repo

trap INT for ghe-backup-repository cleanup

Author: jianghao0718

share/github-backup-utils/ghe-backup-repositories

@@ -90,14 +90,15 @@ cleanup() {
 
   # Enable remote GC operations
   for hostname in $hostnames; do
-    ghe-gc-enable $ssh_config_file_opt $hostname:$port || true
+    ghe-gc-enable $ssh_config_file_opt $hostname:$port || { 
+      echo "Re-enable gc on $hostname failed, please manually delete $SYNC_IN_PROGRESS_FILE" 1>&2
+    }
   done
 
   ghe-ssh "$GHE_HOSTNAME" -- rm -rf $remote_tempdir
   rm -rf $tempdir
 }
-trap 'cleanup' EXIT
-trap 'exit $?' INT # ^C always terminate
+trap 'cleanup' EXIT INT
 
 # Disable remote GC operations
 for hostname in $hostnames; do

share/github-backup-utils/ghe-backup-storage

@@ -59,7 +59,9 @@ mkdir -p "$backup_dir"
 cleanup() {
   # Enable remote maintenance operations
   for hostname in $hostnames; do
-    ghe-gc-enable $ssh_config_file_opt $hostname:$port || true
+    ghe-gc-enable $ssh_config_file_opt $hostname:$port || { 
+      echo "Re-enable gc on $hostname failed, please manually delete $SYNC_IN_PROGRESS_FILE" 1>&2
+    }
   done
 
   ghe-ssh "$GHE_HOSTNAME" -- rm -rf $remote_tempdir