Do not remove old last archive when new last archive is created (left…

…over from old logic)
rupor-github · Aug 24, 2016 · 9ff61d4 · 9ff61d4
1 parent 25b6453
commit 9ff61d4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 project(InpxCreator)
 # Project version number
 set(PRJ_VERSION_MAJOR 6)
-set(PRJ_VERSION_MINOR 65)
+set(PRJ_VERSION_MINOR 7)
 configure_file("${PROJECT_SOURCE_DIR}/cmake/version.h.in" "${PROJECT_BINARY_DIR}/version.h")
 include_directories("${PROJECT_BINARY_DIR}")
 

diff --git a/libmerge/main.go b/libmerge/main.go
@@ -176,7 +176,7 @@ func main() {
 	}
 
 	if merge.info != nil {
-	    if (merge.begin < last.begin || merge.begin > last.begin && merge.begin <= last.end) || merge.end < last.end {
+		if (merge.begin < last.begin || merge.begin > last.begin && merge.begin <= last.end) || merge.end < last.end {
 			log.Fatalf("Merge archive (%s) and last archive (%s) do not match", merge.info.Name(), last.info.Name())
 		}
 		if verbose {
@@ -294,10 +294,13 @@ func main() {
 							log.Fatalf("Renaming archive: %v", err)
 						}
 
-						fmt.Printf("\t--> Removing old last archive: %s\n", last.info.Name())
-						if err := os.Remove(filepath.Join(dest, last.info.Name())); err != nil {
-							log.Fatalf("Removing old last archive: %v", err)
+						last.info, err = os.Stat(newName)
+						if err != nil {
+							log.Fatalf("Stat failed: %v", err)
 						}
+						last.begin = firstBook
+						last.end = lastBook
+						fmt.Printf("\t--> New last archive: %s\n", newName)
 
 						f, err = ioutil.TempFile(dest, "merge-")
 						if err != nil {