diff options
Diffstat (limited to 'buildPackage.go')
| -rw-r--r-- | buildPackage.go | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/buildPackage.go b/buildPackage.go index 8c18df1..3af7cfc 100644 --- a/buildPackage.go +++ b/buildPackage.go @@ -43,6 +43,7 @@ func (c *controlBox) buildPackage() (bool, error) { debname := filename + "_" + version + "_" + arch + ".deb" fulldebname := filepath.Join(homeDir, "incoming", debname) if shell.Exists(fulldebname) { + log.Info("debian package already built: " + fulldebname) return true, errors.New("debian package already built: " + fulldebname) } @@ -76,6 +77,7 @@ func (c *controlBox) buildPackage() (bool, error) { // add some standard golang flags vldflag := "-X main.VERSION=" + version gldflag := "-X main.GUIVERSION=" + version // todo: git this from the filesystem + // timeflag := "-X main.BUILDTIME='${BUILDTIME}'" cmd = append(cmd, "-ldflags", vldflag) cmd = append(cmd, "-ldflags", gldflag) @@ -97,8 +99,9 @@ func (c *controlBox) buildPackage() (bool, error) { } if shell.Exists("files") { - if shell.Run([]string{"rm", "-rf", "files"}) { - log.Warn("rm failed") + shell.Run([]string{"rm", "-rf", "files"}) + if shell.Exists("files") { + log.Warn("rm failed for some reason") return false, errors.New("rm files/") } } @@ -181,8 +184,9 @@ func (c *controlBox) buildPackage() (bool, error) { if argv.KeepFiles { log.Info("keeping the build files/") } else { - if shell.Run([]string{"rm", "-rf", "files"}) { - log.Warn("rm failed") + shell.Run([]string{"rm", "-rf", "files"}) + if shell.Exists("files") { + log.Warn("rm -rf files/ failed. Run() returned false") return false, errors.New("rm files/") } } |