Hotfix (#158)

* hotfix overwrite check

* bump version

Author: rvhonorato

main.go

@@ -18,7 +18,7 @@ import (
 	"github.com/golang/glog"
 )
 
-const version = "v1.13.0"
+const version = "v1.13.1"
 
 func init() {
 	var versionPrint bool
@@ -80,6 +80,11 @@ func main() {
 		glog.Exit("Failed to load input file: " + errInp.Error())
 	}
 
+	// Check if the workdir exists and confirm overwrite
+	if !utils.ConfirmOverwriteIfExists(inp.General.WorkDir, os.Stdin, os.Stdout) {
+		glog.Exit("terminating...")
+	}
+
 	errExec := inp.ValidateExecutable()
 	if errExec != nil {
 		glog.Exit("Failed to validate executable: " + errExec.Error())
@@ -150,11 +155,6 @@ func main() {
 		glog.Exit("Failed to validate checksum: " + errValidateChecksum.Error())
 	}
 
-	// Check if the workdir exists and confirm overwrite
-	if !utils.ConfirmOverwriteIfExists(inp.General.WorkDir, os.Stdin, os.Stdout) {
-		glog.Exit("terminating...")
-	}
-
 	// Organize the dataset
 	orgData, errOrganize := dataset.OrganizeDataset(inp.General.WorkDir, data)
 	if errOrganize != nil {
@@ -186,7 +186,7 @@ func main() {
 	}
 
 	if setupOnly {
-		glog.Exit("Benchmark setup finished successfully, exiting")
+		glog.Info("Benchmark setup finished successfully, exiting")
 		os.Exit(0)
 	}
 

utils/utils.go

@@ -389,8 +389,12 @@ func RemoveString(slice []string, s string) []string {
 
 func ConfirmOverwriteIfExists(path string, in io.Reader, out io.Writer) bool {
 	if _, err := os.Stat(path); !os.IsNotExist(err) {
+		fmt.Fprint(out, "############################################\n")
+		fmt.Fprint(out, "############################################\n")
 		fmt.Fprint(out, "The working directory "+path+" already exists!\n")
-		fmt.Fprint(out, "Do you want to continue and OVERWRITE the contents? (y/N): ")
+		fmt.Fprint(out, "If you continue the benchmark will be setup again\n")
+		fmt.Fprint(out, "This will overwrite any manual changes that you have done to initial data files\n")
+		fmt.Fprint(out, "Partial results will not affected, do you want to continue? (y/N)")
 		scanner := bufio.NewScanner(in)
 		if scanner.Scan() {
 			answer := scanner.Text()