From abc40f79a818b73d09f1f537544c95edd8c0dded Mon Sep 17 00:00:00 2001 From: ZhengYang Date: Thu, 14 Aug 2014 14:25:02 +0800 Subject: [PATCH] fix color log '#' issue and change remove temp file err to warning (does not halt) --- migrate.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/migrate.go b/migrate.go index e080cea..4b2754b 100644 --- a/migrate.go +++ b/migrate.go @@ -16,6 +16,7 @@ package main import ( "database/sql" + "fmt" "os" "os/exec" "path" @@ -300,10 +301,9 @@ func changeDir(dir string) { // removeTempFile removes a file in dir func removeTempFile(dir, file string) { - os.Chdir(dir) + changeDir(dir) if err := os.Remove(file); err != nil { - ColorLog("[ERRO] Could not remove temporary migration files: %s\n", err) - os.Exit(2) + ColorLog("[WARN] Could not remove temporary file: %s\n", err) } } @@ -311,7 +311,8 @@ func removeTempFile(dir, file string) { func formatShellErrOutput(o string) { for _, line := range strings.Split(o, "\n") { if line != "" { - ColorLog("[ERRO] -| %s\n", line) + ColorLog("[ERRO] -| ") + fmt.Println(line) } } } @@ -320,7 +321,8 @@ func formatShellErrOutput(o string) { func formatShellOutput(o string) { for _, line := range strings.Split(o, "\n") { if line != "" { - ColorLog("[INFO] -| %s\n", line) + ColorLog("[INFO] -| ") + fmt.Println(line) } } }