Merge pull request #821 from github/rdelany/timezone-fix

rdelany · web-flow · commit 9f83a84f9752 · 2021-11-24T14:22:45.000-05:00
Add -u to date command in ghe-backup-mssql to fix daylight savings bug
diff --git a/share/github-backup-utils/ghe-backup-mssql b/share/github-backup-utils/ghe-backup-mssql
@@ -42,7 +42,7 @@ add_minute() {
     echo "$(date -v +$2M -ujf'%Y%m%dT%H%M%S' $1 +%Y%m%dT%H%M%S)"
   else
     dt=$1
-    echo "$(date '+%Y%m%dT%H%M%S' -d "${dt:0:8} ${dt:9:2}:${dt:11:2}:${dt:13:2} $2 minutes")"
+    echo "$(date -u '+%Y%m%dT%H%M%S' -d "${dt:0:8} ${dt:9:2}:${dt:11:2}:${dt:13:2} $2 minutes")"
   fi
 }
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ add_minute() {`
`42`	`42`	`echo "$(date -v +$2M -ujf'%Y%m%dT%H%M%S' $1 +%Y%m%dT%H%M%S)"`
`43`	`43`	`else`
`44`	`44`	`dt=$1`
`45`		`- echo "$(date '+%Y%m%dT%H%M%S' -d "${dt:0:8} ${dt:9:2}:${dt:11:2}:${dt:13:2} $2 minutes")"`
	`45`	`+ echo "$(date -u '+%Y%m%dT%H%M%S' -d "${dt:0:8} ${dt:9:2}:${dt:11:2}:${dt:13:2} $2 minutes")"`
`46`	`46`	`fi`
`47`	`47`	`}`
`48`	`48`