- Fix Rx3 archive renaming bug...

nds2rm

@@ -5,9 +5,9 @@
 # (C) 2009 Arnaud G. Gibert
 #-----------------------------------------------------------------------------------------------------------------------------------
 # $RCSfile: nds2rm,v $
-# $Revision: 1.19 $
+# $Revision: 1.20 $
 # $Name:  $
-# $Date: 2009/05/09 21:30:53 $
+# $Date: 2009/10/26 01:35:08 $
 # $Author: agibert $
 #-----------------------------------------------------------------------------------------------------------------------------------
 
@@ -1000,13 +1000,13 @@ function arc_proceed()
                 crc=${dat_crc[${idx}]}
             status2="OK"
 
-	     # Rename the ROM file
+	     # Extract ROM file if not yet done
-	     rom2="${id} - ${title} (${reg}=${lang}) [${status2}].nds"
+	    if [[ "${rom}" == "" ]]
+	    then
+		rom="${id} - ${title} (${reg}=${lang}).nds"
 
-	     print_verbose "moving ${rom} to ${rom2}"
+		rom_extract "${rom}" "${file}"
-
+	    fi
-	     mv "${rom}" "${rom2}"
-	     rom=${rom2}
 
 	    if [[ "${arc_type}" == "rx3" ]]
 	    then
@@ -1030,7 +1030,7 @@ function arc_proceed()
 
     # Rename ROM if needed
 
-    if [[ ( "${renumed}" != "yes") && ( ( "${arc_type}" != "rx3" ) || ( "${rebuild}" == "yes" ) ) ]]
+    if [[ ( "${renumed}" == "yes") || ( "${arc_type}" != "rx3" ) || ( "${rebuild}" == "yes" ) ]]
     then
 	rom2="${id} - ${title} (${reg}=${lang}) [${status}].nds"
 
@@ -1050,7 +1050,7 @@ function arc_proceed()
 
     # Make / Rename Archive
 
-    if [[ ( "${arc_type}" != "rx3" ) || ( ${rebuild} == "yes" ) ]]
+    if [[  ( "${renumed}" == "yes") || ( "${arc_type}" != "rx3" ) || ( ${rebuild} == "yes" ) ]]
     then
 	arc_build  "${file_name}" "${rom}"  "${file}"   "${mode}" "${idx}"
     else