Merge pull request #18 from gocardless/hmac/actually-delete-archive

Actually delete uploaded db archives
gocardless · Sep 26, 2017 · af46c41 · af46c41
2 parents 5bffb0e + 50c97d0
commit af46c41
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.1.4
+-----
+
+Fix a bug where uploaded database archives were not being deleted.
+Minor fix to CLI output formatting
+
 0.1.3
 -----
 

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.1.3
+VERSION=0.1.4
 BUILD_COMMAND=go build -ldflags "-X main.version=$(VERSION)"
 CLIENT_BUILD_COMMAND=go build -ldflags "-X main.version=$(VERSION)"
 PACKAGES=./routes ./models ./store ./auth ./cli ./client

diff --git a/cli/main.go b/cli/main.go
@@ -281,7 +281,7 @@ func showExportCommand(config Config, instance models.Instance) {
 }
 
 func ImageToString(i models.Image) string {
-	return fmt.Sprintf("%d [ %s - READY: %5t ]", i.ID, i.BackedUpAt.Format(time.RFC3339), i.Ready)
+	return fmt.Sprintf("%2d [ %s - READY: %5t ]", i.ID, i.BackedUpAt.Format(time.RFC3339), i.Ready)
 }
 
 func InstanceToString(i models.Instance) string {

diff --git a/cmd/draupnir-finalise-image b/cmd/draupnir-finalise-image
@@ -42,7 +42,7 @@ sudo mkdir "${UPLOAD_PATH}/tmp"
 sudo sh -c "tar xf ${UPLOAD_PATH}/*.tar* -C ${UPLOAD_PATH}/tmp"
 sudo sh -c "mv ${UPLOAD_PATH}/tmp/* ${UPLOAD_PATH}/"
 sudo rmdir "${UPLOAD_PATH}/tmp"
-sudo rm -f  "${UPLOAD_PATH}/*.tar" # remove the compressed backup file
+sudo sh -c "rm -f ${UPLOAD_PATH}/*.tar*" # remove the compressed backup file(s)
 
 sudo rm -f "${UPLOAD_PATH}/postmaster.pid"
 sudo rm -f "${UPLOAD_PATH}/postmaster.opts"