From 91529deab9897e5bb7ba336a249d3608bc337945 Mon Sep 17 00:00:00 2001
From: gabeszm <vgabor92@protonmail.com>
Date: Sat, 21 Dec 2024 15:55:16 +0100
Subject: [PATCH] 00

---
 arch_install.sh | 53 +++++++++++--------------------------------------
 rp_cosmetics.sh | 22 ++++++++++----------
 2 files changed, 24 insertions(+), 51 deletions(-)

diff --git a/arch_install.sh b/arch_install.sh
index e55937c..f725812 100644
--- a/arch_install.sh
+++ b/arch_install.sh
@@ -125,48 +125,19 @@ if [ "$de_choice" == "1" ]; then
     exit 1
   fi
 
-# Cosmetics letöltése és alkalmazása
-echo "Cosmetics letöltése..."
-mkdir cosmetics
-cd cosmetics
-wget -O cosmetics.zip https://files.rp1.hu/api/public/dl/R_0cJkKL/
-unzip cosmetics.zip
-sudo chown -R $USER:$GROUP /home/$USER/cosmetics/
+    # Letöltjük a szkriptet
+  echo "RP_COSMETICS telepítése..."
+  curl -Ls "$RP_COSMETICS_URL" -o rp_cosmetics.sh
+  # Ellenőrizzük, hogy sikerült-e letölteni
+  if [ -f "rp_cosmetics.sh" ]; then
+    echo "A rp_cosmetics telepítő szkript sikeresen letöltve. Futtatás..."
+    sudo chmod +x rp_cosmetics.sh
+    sudo bash -x rp_cosmetics.sh | tee rp_cosmetics.log
+  else
+    echo "Nem sikerült letölteni a rp_cosmetics telepítő szkriptet."
+    exit 1
+  fi
 
-sudo rsync -ap --info=progress2 gnome-shell /home/$USER/.local/share/
-cp -a burn-my-windows /home/$USER/.config/
-sudo cp -a rave-pp.png /usr/share/pixmaps/faces/
-echo "[User]
-Session=
-Icon=/usr/share/pixmaps/faces/rave-pp.png
-SystemAccount=false" | sudo tee /var/lib/AccountsService/users/$USER
-sudo cp -a archlinux-logo-text-dark.svg /usr/share/pixmaps/
-sudo cp -a view-app-grid-symbolic.svg /usr/share/icons/Yaru/scalable/actions/
-dconf load / < raveui-eng
-sudo mkdir -p /usr/share/backgrounds/
-sudo cp -a raveos-bg.png /usr/share/backgrounds/
-sudo cp -a overrides /home/$USER/.local/share/flatpak/
-sudo mkdir -p /home/$USER/.icons/
-sudo mkdir -p /home/$USER/.themes/
-cp -a .icons /home/$USER/
-cp -a .themes /home/$USER/
-
-# RaveOS Cosmetics beállítások
-echo "RaveOS Cosmetics beállítása..."
-gsettings set org.gnome.desktop.interface gtk-theme 'Yaru-purple-dark'
-gsettings set org.gnome.desktop.interface cursor-theme 'Yaru'
-gsettings set org.gnome.desktop.interface icon-theme 'Yaru-purple-dark'
-gsettings set org.gnome.desktop.sound theme-name 'Yaru'
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-gsettings set org.gnome.desktop.session idle-delay 0
-gsettings set org.gnome.desktop.wm.preferences button-layout ":minimize,maximize,close"
-yay -S gdm-tools --noconfirm --sudoloop --save
-
-
-# GDM téma beállítása
-echo "GDM téma beállítása..."
-set-gdm-theme set Yaru-purple-dark /usr/share/backgrounds/raveos-bg.png
-echo "GNOME telepítése befejeződött."
 
 
 
diff --git a/rp_cosmetics.sh b/rp_cosmetics.sh
index 1b68c73..bb6bdea 100644
--- a/rp_cosmetics.sh
+++ b/rp_cosmetics.sh
@@ -1,30 +1,32 @@
 #!/bin/bash
 
+# Használj $(whoami) a $USER helyett
+current_user=$(whoami)
 # Cosmetics letöltése és alkalmazása
 echo "Cosmetics letöltése..."
 mkdir cosmetics
 cd cosmetics
 wget -O cosmetics.zip https://files.rp1.hu/api/public/dl/R_0cJkKL/
 unzip cosmetics.zip
-sudo chown -R $USER:$GROUP /home/$USER/cosmetics/
-
-sudo rsync -ap --info=progress2 gnome-shell /home/$USER/.local/share/
-cp -a burn-my-windows /home/$USER/.config/
+sudo chown -R $$current_user:$GROUP /home/$current_user/cosmetics/
+sudo mkdir -p /home/$current_user/.local/share/
+sudo rsync -ap --info=progress2 gnome-shell /home/$current_user/.local/share/
+cp -a burn-my-windows /home/$current_user/.config/
 sudo cp -a rave-pp.png /usr/share/pixmaps/faces/
 echo "[User]
 Session=
 Icon=/usr/share/pixmaps/faces/rave-pp.png
-SystemAccount=false" | sudo tee /var/lib/AccountsService/users/$USER
+SystemAccount=false" | sudo tee /var/lib/AccountsService/users/$current_user
 sudo cp -a archlinux-logo-text-dark.svg /usr/share/pixmaps/
 sudo cp -a view-app-grid-symbolic.svg /usr/share/icons/Yaru/scalable/actions/
 dconf load / < raveui-eng
 sudo mkdir -p /usr/share/backgrounds/
 sudo cp -a raveos-bg.png /usr/share/backgrounds/
-sudo cp -a overrides /home/$USER/.local/share/flatpak/
-sudo mkdir -p /home/$USER/.icons/
-sudo mkdir -p /home/$USER/.themes/
-cp -a .icons /home/$USER/
-cp -a .themes /home/$USER/
+sudo cp -a overrides /home/$current_user/.local/share/flatpak/
+sudo mkdir -p /home/$current_user/.icons/
+sudo mkdir -p /home/$current_user/.themes/
+cp -a .icons /home/$current_user/
+cp -a .themes /home/$current_user/
 
 # RaveOS Cosmetics beállítások
 echo "RaveOS Cosmetics beállítása..."