Merge pull request #488 from github/juruen/fix-macos

juruen · web-flow · commit 3e01563aa59d · 2019-05-03T17:54:15.000+02:00
fix GNUisms and macOS errors
diff --git a/share/github-backup-utils/ghe-restore-mysql-audit-log b/share/github-backup-utils/ghe-restore-mysql-audit-log
@@ -174,8 +174,7 @@ has_schema_changed(){
 
 # Add DROP TABLE to a table schema dump
 add_drop_table(){
-  # shellcheck disable=SC2016
-  sed '/40101 SET @saved_cs_client/i DROP TABLE IF EXISTS `audit_entries`;'
+  awk '/40101 SET @saved_cs_client/{print "DROP TABLE IF EXISTS `audit_entries`;"}1'
 }
 
 # Restore the audit_entries table schema if it has changed
@@ -185,7 +184,7 @@ restore_schema(){
   fi
 
   gunzip -c "${snapshot_dir}/schema.gz" | add_drop_table | gzip > "${snapshot_dir}/schema.new.gz" 2>&3
-  zcat "${snapshot_dir}/schema.new.gz" 1>&3
+  zcat <"${snapshot_dir}/schema.new.gz" 1>&3
 
   restore_dump schema.new
 }

Original file line number	Diff line number	Diff line change
`@@ -174,8 +174,7 @@ has_schema_changed(){`
`174`	`174`
`175`	`175`	`# Add DROP TABLE to a table schema dump`
`176`	`176`	`add_drop_table(){`
`177`		`- # shellcheck disable=SC2016`
`178`		- sed '/40101 SET @saved_cs_client/i DROP TABLE IF EXISTS `audit_entries`;'
	`177`	+ awk '/40101 SET @saved_cs_client/{print "DROP TABLE IF EXISTS `audit_entries`;"}1'
`179`	`178`	`}`
`180`	`179`
`181`	`180`	`# Restore the audit_entries table schema if it has changed`
`@@ -185,7 +184,7 @@ restore_schema(){`
`185`	`184`	`fi`
`186`	`185`
`187`	`186`	`gunzip -c "${snapshot_dir}/schema.gz" \| add_drop_table \| gzip > "${snapshot_dir}/schema.new.gz" 2>&3`
`188`		`- zcat "${snapshot_dir}/schema.new.gz" 1>&3`
	`187`	`+ zcat <"${snapshot_dir}/schema.new.gz" 1>&3`
`189`	`188`
`190`	`189`	`restore_dump schema.new`
`191`	`190`	`}`