src/define.sh

@@ -135,12 +135,8 @@ parseVersion() {
     "2003" | "2003r2" | "win2003" | "win2003r2" | "windows2003" | "windows 2003" )
       VERSION="win2003r2"
       ;;
-    "nano11" | "nano 11" )
-      VERSION="nano11"
-      [ -z "$DETECTED" ] && DETECTED="win11x64"
-      ;;      
-    "" | "core 11" )
-      VERSION=""
+    "core11" | "core 11" )
+      VERSION="core11"
       [ -z "$DETECTED" ] && DETECTED="win11x64"
       ;;
     "tiny11" | "tiny 11" )
@@ -436,7 +432,6 @@ printVersion() {
     "tiny11"* ) desc="Tiny 11" ;;
     "tiny10"* ) desc="Tiny 10" ;;
     "core11"* ) desc="Core 11" ;;
-    "nano11"* ) desc="Nano 11" ;;    
     "win7"* ) desc="Windows 7" ;;
     "win8"* ) desc="Windows 8" ;;
     "win10"* ) desc="Windows 10" ;;
@@ -575,9 +570,6 @@ fromFile() {
     *"winvista"* | *"win_vista"* | *"windowsvista"* | *"windows_vista"* )
       id="winvista${arch}"
       ;;
-    "nano11"* | "nano_11"* )
-      id="nano11"
-      ;;     
     "tiny11core"* | "tiny11_core"* | "tiny_11_core"* )
       id="core11"
       ;;
@@ -1101,11 +1093,6 @@ getLink4() {
   [[ "${lang,,}" != "en" ]] && [[ "${lang,,}" != "en-us" ]] && return 0
 
   case "${id,,}" in
-    "nano11" )
-      size=2463565824
-      sum="a1e0614372768cbe2d24de74b78a4a97bc1017ea5080dfed1d2125e4a527eb1a"
-      url="nano11_25h2/nano11%2025h2.iso"
-      ;;
     "core11" )
       size=2159738880
       sum="78f0f44444ff95b97125b43e560a72e0d6ce0a665cf9f5573bf268191e5510c1"

src/install.sh

@@ -9,40 +9,30 @@ backup () {
 
   local count=1
   local iso="$1"
-  local name="unknown"
-  local root="$STORAGE/backups"
-  local previous="$STORAGE/windows.base"
-
-  if [ -f "$previous" ]; then
-
-    previous=$(<"$previous")
-    previous="${previous//[![:print:]]/}"
-
-    [ -n "$previous" ] && name="${previous%.*}"
-
-  fi
-
-  mkdir -p "$root"
+  local name="$2"
   local folder="$name"
-  local dir="$root/$folder"
+  local dir="$STORAGE/backups"
 
-  while [ -d "$dir" ]
+  mkdir -p "$dir"
+
+  while [ -d "$STORAGE/$folder" ]
   do
     count=$[$count +1]
     folder="${name}.${count}"
-    dir="$root/$folder"
   done
 
+  dir+="/$folder"
+
   rm -rf "$dir"
   mkdir -p "$dir"
 
   [ -f "$iso" ] && mv -f "$iso" "$dir/"
-  find "$STORAGE" -maxdepth 1 -type f -iname 'data.*' -not -iname '*.iso' -exec mv -n {} "$dir/" \;
-  find "$STORAGE" -maxdepth 1 -type f -iname 'windows.*' -not -iname '*.iso' -exec mv -n {} "$dir/" \;
   find "$STORAGE" -maxdepth 1 -type f \( -iname '*.rom' -or -iname '*.vars' \) -exec mv -n {} "$dir/" \;
+  find "$STORAGE" -maxdepth 1 -type f \( -iname 'data.*' -or -iname 'windows.*' \) -exec mv -n {} "$dir/" \;
 
-  [ -z "$(ls -A "$dir")" ] && rm -rf "$dir"
-  [ -z "$(ls -A "$root")" ] && rm -rf "$root"
+  if [ -z "$(ls -A "$dir")" ]; then
+    rm -rf "$dir"
+  fi
 
   return 0
 }
@@ -61,6 +51,7 @@ skipInstall() {
     previous="${previous//[![:print:]]/}"
 
     if [ -n "$previous" ]; then
+
       if [[ "${STORAGE,,}/${previous,,}" != "${iso,,}" ]]; then
 
         if ! hasDisk; then
@@ -87,7 +78,10 @@ skipInstall() {
         fi
 
         info "Detected that $method, a backup of your previous installation will be saved..."
-        ! backup "$STORAGE/$previous" && error "Backup failed!"
+
+        if ! backup "$STORAGE/$previous" "${previous%.*}"; then
+          error "Backup failed!"
+        fi
 
         return 1
 
@@ -152,7 +146,11 @@ startInstall() {
   skipInstall "$BOOT" && return 1
 
   if hasDisk; then
-    ! backup "" && error "Backup failed!"
+
+    if ! backup "" "backup"; then
+      error "Backup failed!"
+    fi
+
   fi
 
   mkdir -p "$TMP"
@@ -170,9 +168,8 @@ startInstall() {
 
   rm -f "$BOOT"
 
-  find "$STORAGE" -maxdepth 1 -type f -iname 'data.*' -not -iname '*.iso' -delete
-  find "$STORAGE" -maxdepth 1 -type f -iname 'windows.*' -not -iname '*.iso' -delete
   find "$STORAGE" -maxdepth 1 -type f \( -iname '*.rom' -or -iname '*.vars' \) -delete
+  find "$STORAGE" -maxdepth 1 -type f \( -iname 'data.*' -or -iname 'windows.*' \) -delete
 
   return 0
 }