From a864adb0eeb06bfbcc05065db75d408b5c638aaf Mon Sep 17 00:00:00 2001
From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com>
Date: Sun, 15 Mar 2026 16:54:57 +0100
Subject: [PATCH] Standardize NSAPP names across VM scripts

Normalize the NSAPP variable values in multiple vm/*.sh scripts for consistent naming (archlinux-vm, debian-13-vm, debian-vm, haos-vm, mikrotik-routeros, nextcloud-vm, owncloud-vm, ubuntu2204-vm, ubuntu2404-vm, ubuntu2504-vm) and add the missing NSAPP entry for truenas-vm. These changes are purely renames to standardize identifiers used by tooling or downstream logic and do not alter other behavior.
---
 vm/archlinux-vm.sh      | 2 +-
 vm/debian-13-vm.sh      | 2 +-
 vm/debian-vm.sh         | 2 +-
 vm/haos-vm.sh           | 2 +-
 vm/mikrotik-routeros.sh | 2 +-
 vm/nextcloud-vm.sh      | 2 +-
 vm/owncloud-vm.sh       | 2 +-
 vm/truenas-vm.sh        | 1 +
 vm/ubuntu2204-vm.sh     | 2 +-
 vm/ubuntu2404-vm.sh     | 2 +-
 vm/ubuntu2504-vm.sh     | 2 +-
 11 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/vm/archlinux-vm.sh b/vm/archlinux-vm.sh
index dc681a694..482f09c85 100644
--- a/vm/archlinux-vm.sh
+++ b/vm/archlinux-vm.sh
@@ -22,7 +22,7 @@ echo -e "\n Loading..."
 GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//')
 RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"
 METHOD=""
-NSAPP="arch-linux-vm"
+NSAPP="archlinux-vm"
 var_os="arch-linux"
 var_version="n.d."
 
diff --git a/vm/debian-13-vm.sh b/vm/debian-13-vm.sh
index 18cb1a681..4b52b7d47 100644
--- a/vm/debian-13-vm.sh
+++ b/vm/debian-13-vm.sh
@@ -22,7 +22,7 @@ echo -e "\n Loading..."
 GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//')
 RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"
 METHOD=""
-NSAPP="debian13vm"
+NSAPP="debian-13-vm"
 var_os="debian"
 var_version="13"
 
diff --git a/vm/debian-vm.sh b/vm/debian-vm.sh
index 063057a78..cff40a43a 100644
--- a/vm/debian-vm.sh
+++ b/vm/debian-vm.sh
@@ -22,7 +22,7 @@ echo -e "\n Loading..."
 GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//')
 RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"
 METHOD=""
-NSAPP="debian12vm"
+NSAPP="debian-vm"
 var_os="debian"
 var_version="12"
 
diff --git a/vm/haos-vm.sh b/vm/haos-vm.sh
index f0d58afe8..832640e0a 100644
--- a/vm/haos-vm.sh
+++ b/vm/haos-vm.sh
@@ -23,7 +23,7 @@ GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:
 RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"
 VERSIONS=(stable beta dev)
 METHOD=""
-NSAPP="homeassistant-os"
+NSAPP="haos-vm"
 var_os="homeassistant"
 DISK_SIZE="32G"
 
diff --git a/vm/mikrotik-routeros.sh b/vm/mikrotik-routeros.sh
index eb0532d6a..4e46f5900 100644
--- a/vm/mikrotik-routeros.sh
+++ b/vm/mikrotik-routeros.sh
@@ -23,7 +23,7 @@ echo -e "Loading..."
 GEN_MAC=$(echo '00 60 2f'$(od -An -N3 -t xC /dev/urandom) | sed -e 's/ /:/g' | tr '[:lower:]' '[:upper:]')
 RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"
 METHOD=""
-NSAPP="mikrotik-router-os"
+NSAPP="mikrotik-routeros"
 var_os="mikrotik"
 var_version=" "
 DISK_SIZE="1G"
diff --git a/vm/nextcloud-vm.sh b/vm/nextcloud-vm.sh
index c17b299be..3307cc6b7 100644
--- a/vm/nextcloud-vm.sh
+++ b/vm/nextcloud-vm.sh
@@ -22,7 +22,7 @@ echo -e "\n Loading..."
 GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//')
 RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"
 METHOD=""
-NSAPP="turnkey-nextcloud"
+NSAPP="nextcloud-vm"
 var_os="turnkey-nextcloud"
 var_version="n.d."
 
diff --git a/vm/owncloud-vm.sh b/vm/owncloud-vm.sh
index 5efe13ca4..d0ebe2115 100644
--- a/vm/owncloud-vm.sh
+++ b/vm/owncloud-vm.sh
@@ -22,7 +22,7 @@ echo -e "\n Loading..."
 GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//')
 RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"
 METHOD=""
-NSAPP="turnkey-owncloud-vm"
+NSAPP="owncloud-vm"
 var_os="owncloud"
 var_version="18.0"
 APP="TurnKey ownCloud VM"
diff --git a/vm/truenas-vm.sh b/vm/truenas-vm.sh
index 6066a29d6..3e7274543 100644
--- a/vm/truenas-vm.sh
+++ b/vm/truenas-vm.sh
@@ -23,6 +23,7 @@ echo -e "\n Loading..."
 GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//')
 RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"
 METHOD=""
+NSAPP="truenas-vm"
 
 YW=$(echo "\033[33m")
 BL=$(echo "\033[36m")
diff --git a/vm/ubuntu2204-vm.sh b/vm/ubuntu2204-vm.sh
index b118863ec..0c281ec7f 100644
--- a/vm/ubuntu2204-vm.sh
+++ b/vm/ubuntu2204-vm.sh
@@ -22,7 +22,7 @@ echo -e "\n Loading..."
 GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//')
 RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"
 METHOD=""
-NSAPP="ubuntu-2204-vm"
+NSAPP="ubuntu2204-vm"
 var_os="ubuntu"
 var_version="2204"
 
diff --git a/vm/ubuntu2404-vm.sh b/vm/ubuntu2404-vm.sh
index 25e5c2ea9..eba9846a5 100644
--- a/vm/ubuntu2404-vm.sh
+++ b/vm/ubuntu2404-vm.sh
@@ -23,7 +23,7 @@ echo -e "\n Loading..."
 GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//')
 RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"
 METHOD=""
-NSAPP="ubuntu-2404-vm"
+NSAPP="ubuntu2404-vm"
 var_os="ubuntu"
 var_version="2404"
 
diff --git a/vm/ubuntu2504-vm.sh b/vm/ubuntu2504-vm.sh
index 7b0176f69..f9040855d 100644
--- a/vm/ubuntu2504-vm.sh
+++ b/vm/ubuntu2504-vm.sh
@@ -22,7 +22,7 @@ echo -e "\n Loading..."
 GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//')
 RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"
 METHOD=""
-NSAPP="ubuntu-2504-vm"
+NSAPP="ubuntu2504-vm"
 var_os="ubuntu"
 var_version="2504"