Merge pull request #720 from christopherb-stripe/fix-external-database-restore-check

bwestover · web-flow · commit dba983945bea · 2021-04-20T13:02:42.000-07:00
Fix is_default_external_database_snapshot function
diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
@@ -468,7 +468,7 @@ is_external_database_snapshot(){
 # This file exists if this is a backup for an external database AND the backup was
 # taken via our logical backup strategy.
 is_default_external_database_snapshot(){
-  is_external_database_snapshot && test -f "$1/logical-external-database-backup-sentinel"
+  is_external_database_snapshot && test -f "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/logical-external-database-backup-sentinel"
 }
 
 prompt_for_confirmation(){

Original file line number	Diff line number	Diff line change
`@@ -468,7 +468,7 @@ is_external_database_snapshot(){`
`468`	`468`	`# This file exists if this is a backup for an external database AND the backup was`
`469`	`469`	`# taken via our logical backup strategy.`
`470`	`470`	`is_default_external_database_snapshot(){`
`471`		`- is_external_database_snapshot && test -f "$1/logical-external-database-backup-sentinel"`
	`471`	`+ is_external_database_snapshot && test -f "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/logical-external-database-backup-sentinel"`
`472`	`472`	`}`
`473`	`473`
`474`	`474`	`prompt_for_confirmation(){`