From 2e1cec5d5d11243ae7ec9e0b137fbd1e811075a4 Mon Sep 17 00:00:00 2001
From: Nippy <nippy@Nippy-Mac-mini.local>
Date: Thu, 17 Sep 2026 17:59:22 +0200
Subject: fix app/tools

---
 raveos-app-installer/data/actions/discord.sh | 42 ++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 9 deletions(-)

(limited to 'raveos-app-installer/data/actions/discord.sh')

diff --git a/raveos-app-installer/data/actions/discord.sh b/raveos-app-installer/data/actions/discord.sh
index efff51e..c1b60c7 100755
--- a/raveos-app-installer/data/actions/discord.sh
+++ b/raveos-app-installer/data/actions/discord.sh
@@ -48,6 +48,15 @@ remove_installed_packages() {
     fi
 }
 
+find_discord_dir() {
+    local d
+    d="$(pacman -Qlq discord 2>/dev/null | grep '/resources/app.asar$' | head -1 | sed 's#/resources/app.asar$##')"
+    if [[ -z "$d" && -d /usr/lib/discord ]]; then
+        d="/usr/lib/discord"
+    fi
+    printf '%s\n' "$d"
+}
+
 if [[ "$ACTION" == "remove" ]]; then
     echo "Removing Discord + Vencord for $USER..."
     remove_installed_packages discord
@@ -87,13 +96,21 @@ chmod +x "$TMPDIR/VencordInstallerCli-linux"
 cp "$TMPDIR/VencordInstallerCli-linux" /usr/local/bin/VencordInstallerCli-linux
 chmod +x /usr/local/bin/VencordInstallerCli-linux
 
-# Vencord telepítése user módban, auto-detect (Discord a user ~/.config/discord/-ban van)
-# Az Arch discord csomag bootstrap: első futtatáskor tölti le Discordot a user home-ba.
-# Ha még nem futott a Discord, a telepítés csendesen megbukik - a pacman hook elvégzi
-# a következő Discord frissítés után automatikusan.
-echo "Installing Vencord (user mode)..."
-run_as_user /usr/local/bin/VencordInstallerCli-linux -install 2>/dev/null || true
-run_as_user /usr/local/bin/VencordInstallerCli-linux -install-openasar 2>/dev/null || true
+# Vencord telepítése. Az újabb discord csomag a /usr/lib/discord-ba telepít,
+# ezért ott root-ként, explicit -location-nel patchelünk. Régi bootstrap
+# Discord (user home-ba települő) esetén user módban auto-detect.
+DISCORD_DIR="$(find_discord_dir)"
+
+echo "Installing Vencord..."
+if [[ -n "$DISCORD_DIR" && -d "$DISCORD_DIR" ]]; then
+    echo "Discord location: $DISCORD_DIR"
+    /usr/local/bin/VencordInstallerCli-linux -install -location "$DISCORD_DIR" 2>/dev/null || true
+    /usr/local/bin/VencordInstallerCli-linux -openasar -location "$DISCORD_DIR" 2>/dev/null || true
+else
+    echo "Discord bootstrap not found, trying user-mode auto-detect..."
+    run_as_user /usr/local/bin/VencordInstallerCli-linux -install 2>/dev/null || true
+    run_as_user /usr/local/bin/VencordInstallerCli-linux -openasar 2>/dev/null || true
+fi
 
 # Pacman hook: Discord update után Vencord újratelepítés
 mkdir -p /etc/pacman.d/hooks
@@ -113,8 +130,15 @@ HOOK
 # Reinstall script - user neve bele van égetve telepítéskor
 cat > /usr/local/bin/vencord-reinstall.sh << SCRIPT
 #!/bin/bash
-runuser -u "$USER" -- env HOME="$HOME" /usr/local/bin/VencordInstallerCli-linux -install || true
-runuser -u "$USER" -- env HOME="$HOME" /usr/local/bin/VencordInstallerCli-linux -install-openasar || true
+DISCORD_DIR="\$(pacman -Qlq discord 2>/dev/null | grep '/resources/app.asar$' | head -1 | sed 's#/resources/app.asar\$##')"
+if [ -z "\$DISCORD_DIR" ]; then DISCORD_DIR="/usr/lib/discord"; fi
+if [ -d "\$DISCORD_DIR" ]; then
+    /usr/local/bin/VencordInstallerCli-linux -install -location "\$DISCORD_DIR" || true
+    /usr/local/bin/VencordInstallerCli-linux -openasar -location "\$DISCORD_DIR" || true
+else
+    runuser -u "$USER" -- env HOME="$HOME" /usr/local/bin/VencordInstallerCli-linux -install || true
+    runuser -u "$USER" -- env HOME="$HOME" /usr/local/bin/VencordInstallerCli-linux -openasar || true
+fi
 SCRIPT
 chmod +x /usr/local/bin/vencord-reinstall.sh
 
-- 
cgit v1.3