do not run build.sh if no build runlevel

blablacar · Jul 31, 2015 · 4de4945 · 4de4945
1 parent b8a2473
commit 4de4945
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/builder/cnt.go b/builder/cnt.go
@@ -204,6 +204,9 @@ func (cnt *Cnt) Build() error {
 }
 
 func (cnt *Cnt) runBuild() {
+	if res, err := utils.IsDirEmpty(cnt.target + "/runlevels/build"); res || err != nil {
+		return
+	}
 	if err := utils.ExecCmd("systemd-nspawn", "--version"); err == nil {
 		log.Get().Info("Run with systemd-nspawn")
 		if err := utils.ExecCmd("systemd-nspawn", "--directory=" + cnt.rootfs, "--capability=all",

diff --git a/utils/files.go b/utils/files.go
@@ -0,0 +1,19 @@
+package utils
+import (
+	"os"
+	"io"
+)
+
+func IsDirEmpty(name string) (bool, error) {
+	f, err := os.Open(name)
+	if err != nil {
+		return false, err
+	}
+	defer f.Close()
+
+	_, err = f.Readdir(1)
+	if err == io.EOF {
+		return true, nil
+	}
+	return false, err // Either not empty or error, suits both cases
+}