From a5628c6b898305b2ea7df1779b084953e28b5d5d Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Mon, 7 Apr 2025 16:07:04 +0200
Subject: [PATCH] fixes

---
 ct/musicassistant.sh |  4 ++--
 misc/install.func    | 19 +++++++------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/ct/musicassistant.sh b/ct/musicassistant.sh
index 62bc4a2..ad4002d 100644
--- a/ct/musicassistant.sh
+++ b/ct/musicassistant.sh
@@ -10,8 +10,8 @@ var_tags="${var_tags:-music}"
 var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-2048}"
 var_disk="${var_disk:-7}"
-var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_os="${var_os:-ubuntu}"
+var_version="${var_version:-24.10}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
diff --git a/misc/install.func b/misc/install.func
index 4228d3a..7b54c5d 100644
--- a/misc/install.func
+++ b/misc/install.func
@@ -434,19 +434,14 @@ fetch_and_deploy_gh_release() {
   fi
 
   mkdir -p "/opt/$app"
-  local extracted=false
-  if tar -tzf "$tmpdir/$filename" | grep -q '/'; then
-    if tar -xzf "$tmpdir/$filename" -C "/opt/$app" --strip-components=1; then
-      extracted=true
-    fi
-  fi
 
-  if [[ $extracted != true ]]; then
-    if ! tar -xzf "$tmpdir/$filename" -C "/opt/$app"; then
-      msg_error "Failed to extract archive for $app"
-      rm -rf "$tmpdir"
-      return 1
-    fi
+  tar -xzf "$tmpdir/$filename" -C "$tmpdir"
+  local content_root
+  content_root=$(find "$tmpdir" -mindepth 1 -maxdepth 1 -type d)
+  if [[ $(echo "$content_root" | wc -l) -eq 1 ]]; then
+    cp -r "$content_root"/* "/opt/$app/"
+  else
+    cp -r "$tmpdir"/* "/opt/$app/"
   fi
 
   echo "$version" >"/opt/${app}_version.txt"