Fixes Branch Dirs

.gitignore

@@ -1,2 +1,3 @@
 target*
 source*
+go-gluon-publish

main.go

@@ -21,7 +21,7 @@ func main() {
 	br := *branch
 	version := readVersions(*branch)
 	var source_dir_branch string = sdir + br + "/images/"
-	var target_dir_branch string = tdir + br + "/images/"
+	var target_dir_branch string = tdir + br
 
 	if is_firmware_folder(source_dir_branch) {
 		//generate manifest file for branch

release.go

@@ -19,27 +19,40 @@ func release_branch(b string, sDir string, tDir string, dryrun bool, v string) {
 	}
 	sVersion := GetGluonVersion(sDir)
 	tVersion := GetGluonVersion(tDir)
+	fmt.Println("Target Version:", b, tVersion)
+	fmt.Println("Source Version:", b, sVersion)
+	fmt.Println("Wanted Version:", b, v)
 	//check wanted version in target
-	if tVersion != v {
-		log.Println("published version is outdated, try to update from source folder")
-		if sVersion != v {
-			log.Println("wanted Version is not availible in source folder")
-			os.Exit(1)
-		}
+	if tVersion == v {
+		log.Println(b, "wanted version is already published!")
+		os.Exit(0)
+	}
+	log.Println(b, "published version is outdated, try to update from source folder")
+	if sVersion != v {
+		log.Println(b, "wanted Version is not availible in source folder")
+		os.Exit(1)
 	}
 
 	if newImages {
 		// delete old firmware files in public folder
-		for _, file := range check_tDir {
-			if !(dryrun) {
-				err := os.RemoveAll(tDir + file.Name())
-				if err != nil {
-					log.Println("error deleting file: ", err)
+		// if we are in stable branch, move images to archive
+		if b == "stable" {
+			err := os.Rename(tDir+"/*", tDir+"/archive/"+v)
+			if err != nil {
+				log.Fatalln(err)
+			}
+		} else {
+			for _, file := range check_tDir {
+				if !(dryrun) {
+					err := os.RemoveAll(tDir + "/" + file.Name())
+					if err != nil {
+						log.Println("error deleting file: ", err)
+					} else {
+						log.Println("removed file: ", file.Name())
+					}
 				} else {
-					log.Println("removed file: ", file.Name())
+					log.Println("DRYRUN: delete folder :", file.Name())
 				}
-			} else {
-				log.Println("DRYRUN: delete folder :", file.Name())
 			}
 		}
 
@@ -56,7 +69,7 @@ func release_branch(b string, sDir string, tDir string, dryrun bool, v string) {
 }
 
 func GetGluonVersion(path string) string {
-	image_folder := path + "sysupgrade/"
+	image_folder := path + "/sysupgrade/"
 	files, err := filepath.Glob(filepath.Join(image_folder, "gluon-tdf-*"))
 	if err != nil {
 		fmt.Println("Error reading directory: ", err)
@@ -76,7 +89,7 @@ func GetGluonVersion(path string) string {
 }
 
 func readVersions(branch string) string {
-	filePath := "release_state.json"
+	filePath := "/srv/fwuploads-tmp/bin/release_state.json"
 	v, err := ioutil.ReadFile(filePath)
 	if err != nil {
 		log.Fatalln("Error reading version JSON file!")