Update ros-progs-gui.sh

Reviewed-on: RP1/RaveOS-arch#27

backup-raveos.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+Locale=$(locale | grep "LANG")
+Desktop=$XDG_CURRENT_DESKTOP
+
 # Text modifiers
 bold=$(tput bold)      # ${bold}
 normal=$(tput sgr0)    # ${normal}
@@ -31,8 +34,6 @@ sudo echo
 
 if [[ $user_choice = *"BACKUP All of My Data and Settings"* ]]; then
   cd
-  Locale=$(locale | grep "LANG" -c)
-  Desktop=$XDG_CURRENT_DESKTOP
   echo
   echo -----------------------------------------------------
   echo Copying ${bold}${yellow}$USER Settings and Files${normal} into ${bold}${yellow}$FOLDER/${normal}
@@ -115,6 +116,7 @@ if [[ $user_choice = *"BACKUP All of My Data and Settings"* ]]; then
 
   mkdir -p $FOLDER/etc/
   sudo rsync -ap --info=progress2 /etc/libvirt $FOLDER/etc 2>/dev/null
+  sudo rsync -ap --info=progress2 /etc/resolv.conf $FOLDER/etc 2>/dev/null
 
   sudo rsync -ap --info=progress2 /usr/share/jellyfin/web/config.json $FOLDER 2>/dev/null
 
@@ -127,7 +129,7 @@ if [[ $user_choice = *"BACKUP All of My Data and Settings"* ]]; then
     rsync -ap --info=progress2 /home/$USER/Zenék/ $FOLDER
     rsync -ap --info=progress2 /home/$USER/Képek/ $FOLDER
     rsync -ap --info=progress2 /home/$USER/Videók/ $FOLDER
-    rsync -ap --info=progress2 /home/$USER/Calibre\ Library/ 2>/dev/null $FOLDER
+    rsync -ap --info=progress2 /home/$USER/Calibre\ Library/ $FOLDER 2>/dev/null
   else
     echo ${bold}${yellow}English Language detected.${normal}
     # EN lang
@@ -137,7 +139,7 @@ if [[ $user_choice = *"BACKUP All of My Data and Settings"* ]]; then
     rsync -ap --info=progress2 /home/$USER/Music $FOLDER 
     rsync -ap --info=progress2 /home/$USER/Pictures $FOLDER 
     rsync -ap --info=progress2 /home/$USER/Videos $FOLDER
-    rsync -ap --info=progress2 /home/$USER/Calibre\ Library/ 2>/dev/null $FOLDER
+    rsync -ap --info=progress2 /home/$USER/Calibre\ Library/ $FOLDER 2>/dev/null
   fi
   
   if [[ $Desktop == GNOME ]]; then
@@ -161,21 +163,21 @@ if [[ $user_choice = *"BACKUP All of My Data and Settings"* ]]; then
   echo ${bold}${yellow} BACKUP SCRIPT FINISHED SUCCESSFULLY! ${normal}
 fi
 
-if [[ $user_choice = *"Restore all of my data and settings"* ]]; then
+if [[ $user_choice = *"RESTORE All of My Data and Settings"* ]]; then
-  Locale=$(locale | grep "LANG")
-  Desktop=$XDG_CURRENT_DESKTOP
   echo
   echo -----------------------------------------------------
-  echo Copying ${bold}${yellow}Restoring $USER Settings and Files ${normal} into ${bold}${yellow}$FOLDER/${normal}
+  echo Copying ${bold}${yellow}Restoring - $USER - Settings and Files ${normal} into ${bold}${yellow}$FOLDER/${normal}
  
-  sudo rsync -ap --info=progress2 $FOLDER/etc/libvirt /etc/
+  sudo rsync -ap --info=progress2 $FOLDER/etc/libvirt /etc/ 2>/dev/null
-  sudo rsync -ap --info=progress2 $FOLDER/config.json /usr/share/jellyfin/web/
+  sudo rsync -ap --info=progress2 $FOLDER/config.json /usr/share/jellyfin/web/ 2>/dev/null
-  rsync -ap --info=progress2 $FOLDER /home/$USER/
+  sudo rsync -ap --info=progress2 $FOLDER /home/$USER/
 
   if [[ $Desktop == GNOME ]]; then
   # GNOME SECTION
     echo ${bold}${yellow}GNOME Detected - Loading Dconf${normal}
     dconf load / < $FOLDER/$USER-ui
+    echo
+    echo ${bold}${yellow} Dconf loaded${normal}
   else
   # KDE Section
     echo ${bold}${yellow}KDE Detected - Loading Konsave${normal}
@@ -186,6 +188,4 @@ if [[ $user_choice = *"Restore all of my data and settings"* ]]; then
   sudo chown -R $USER:$GROUP /home/$USER/
   echo
   echo ${bold}${yellow}SETTINGS RESTORED SUCCESSFULLY! ${normal}
-fi
+fi
-
-exit 1

raveos-gnome.sh

@@ -92,7 +92,7 @@ fi
     mkdir cosmetics
     sudo chown -R $USER:$GROUP /home/$USER/cosmetics/
     cd cosmetics
-    wget -O cosmetics.zip https://files.rp1.hu/api/public/dl/K7znaGkC/
+    wget -O cosmetics.zip https://files.rp1.hu/share/s9s3ixnbb319/cosmetics.zip
     unzip cosmetics.zip
    
 

ros-progs-gui.sh

@@ -1,9 +1,12 @@
 #!/bin/bash
 
+#testttt
+
+# ROS Telepito szamlalo by Marci
 APP_DIR="/home/$USER/.local/share/applications"
 FILE_NAME="RaveOS-greeting"
 URL="https://links.rp1.hu/counter"
-GREETING_TEXT="Köszönjük, hogy telepítetted az RaveOS GNOME Gaminx Linux-ot!"
+GREETING_TEXT="Köszönjük, hogy telepítetted a RaveOS Linuxot!"
 
 if [ ! -f "$APP_DIR/$FILE_NAME" ]; then
     curl $URL -s --insecure > /dev/null
@@ -15,11 +18,9 @@ bold=$(tput bold)      # ${bold}
 normal=$(tput sgr0)    # ${normal}
 yellow=$(tput setaf 3) # ${yellow}
 
-# APT/Flatpak APP TELEPITO SCRIPT
-
 # Entering work folder
 cd /usr/local/bin/progs
-sudo curl -Ls https://links.rp1.hu/progsgui -o /usr/local/bin/progs/3progs.sh
+sudo curl -Ls https://links.rp1.hu/progsgui -o /usr/local/bin/progs/3progs.sh 2>/dev/null
 
 # Changing Profile Picture to RP LOGO
 echo -e "[User]\nSession=\nIcon=/usr/share/backgrounds/rave-pp.png\nSystemAccount=false" | sudo tee /var/lib/AccountsService/users/$USER > /dev/null
@@ -76,6 +77,7 @@ user_choice=$(zenity --list --checklist --width='1000' --height='1000' \
   FALSE "Mumble - hang alapú csevegőalkalmazás" \
   FALSE "Nomacs - képnézegető / szerkesztő" \
   FALSE "Nyomtato - Ha hasznalsz nyomtatot, tedd fel" \
+  FALSE "OCCT - Stress Test progi" \
   FALSE "OnlyOffice - Legujabb MS Office Linuxos megfeleloje - LIBREOFFICE-t TOROLNI FOGJA!" \
   FALSE "OBS - Nyílt forrású felvételkészítő és streamelő program" \
   FALSE "Parabolic - Videóletöltő, működik minden platformon" \
@@ -92,6 +94,7 @@ user_choice=$(zenity --list --checklist --width='1000' --height='1000' \
   FALSE "Spotube - Ingyenes Premium Spotify Zenelejátszó Linuxra" \
   FALSE "Steam Launcher" \
   FALSE "Systemd boot mod - 1sec varakozas bootolaskor" \
+  FALSE "Systemd boot mod - 3sec varakozas bootolaskor" \
   FALSE "TeamSpeak3 - TeamSpeak VOIP kliens" \
   FALSE "Telegram - Titkosított üzenetküldő" \
   FALSE "TOR Böngésző" \
@@ -174,7 +177,19 @@ if [[ $user_choice = *"Systemd boot mod - 1sec varakozas bootolaskor"* ]]; then
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}Systemd boot mod${normal}
 
-    sudo sed -i 's/timeout 3/timeout 1/' /boot/loader/loader.conf
+    sudo sed -i 's/timeout 5/timeout 1/' /boot/loader/loader.conf
+
+  echo ${bold}${yellow}Systemd boot mod ${normal}installed.
+  echo ---------------------------------------------
+  echo
+fi
+
+if [[ $user_choice = *"Systemd boot mod - 3sec varakozas bootolaskor"* ]]; then
+  echo
+  echo ---------------------------------------------
+  echo Installing ${bold}${yellow}Systemd boot mod${normal}
+
+    sudo sed -i 's/timeout 1/timeout 3/' /boot/loader/loader.conf
 
   echo ${bold}${yellow}Systemd boot mod ${normal}installed.
   echo ---------------------------------------------
@@ -223,7 +238,7 @@ if [[ $user_choice = *"P7Zip - tömörítő program"* ]]; then
   echo
   echo Installing ${bold}${yellow}P7Zip${normal}
 
-  yay -S p7zip-full-bin --noconfirm
+  sudo pacman -S p7zip-gui --noconfirm
 
   echo ${bold}${yellow}P7Zip ${normal}installed.
   echo
@@ -247,7 +262,7 @@ if [[ $user_choice = *"Input-Remapper 2.0 - egér/bill. gomb konfiguráló, macr
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}Input-Remapper 2.0${normal}
 
-  yay -S input-remapper-bin --noconfirm
+  sudo pacman -S input-remapper-git --noconfirm
   sudo systemctl enable input-remapper.service
 
   echo ${bold}${yellow}Input-Remapper 2.0 ${normal}installed.
@@ -283,11 +298,11 @@ fi
 if [[ $user_choice = *"Nomacs - képnézegető / szerkesztő"* ]]; then
   echo
   echo ---------------------------------------------
-  echo Installing ${bold}${yellow}Mumble${normal}
+  echo Installing ${bold}${yellow}Nomacs${normal}
 
-  yay -S nomacs-git --noconfirm
+  sudo pacman -S nomacs --noconfirm
 
-  echo ${bold}${yellow}Mumble ${normal}installed.
+  echo ${bold}${yellow}Nomacs ${normal}installed.
   echo ---------------------------------------------
   echo
 fi
@@ -298,7 +313,7 @@ if [[ $user_choice = *"Nyomtato - Ha hasznalsz nyomtatot, tedd fel"* ]]; then
   echo Installing ${bold}${yellow}Printers${normal}
 
   sudo pacman -S cups hplip cnifilter2 system-config-printer --noconfirm
-  yay -S epson-inkjet-printer-escpr epson-inkjet-printer-escpr2 --noconfirm
+  sudo pacman -S epson-inkjet-printer-escpr epson-inkjet-printer-escpr2 epson-inkjet-printer-202101w --noconfirm
   sudo systemctl enable cups --now
 
   echo ${bold}${yellow}Printers ${normal}installed.
@@ -306,6 +321,24 @@ if [[ $user_choice = *"Nyomtato - Ha hasznalsz nyomtatot, tedd fel"* ]]; then
   echo
 fi
 
+if [[ $user_choice = *"OCCT - Stress Test progi"* ]]; then
+  echo
+  echo ---------------------------------------------
+  echo Installing ${bold}${yellow}OCCT Stress test${normal}
+
+  sudo wget https://www.ocbase.com/download/edition:Personal/testing:true/os:Linux -O /usr/local/bin/progs/OCCT
+  sudo mkdir -p /opt/OCCT/
+  sudo mv /usr/local/bin/progs/OCCT /opt/OCCT/
+  sudo chmod +x /opt/OCCT/OCCT
+  sudo cp -a occt.desktop /usr/share/applications
+  sudo chmod +x /usr/share/applications/occt.desktop
+  sudo cp -a occt-icon.png /usr/share/icons
+
+  echo ${bold}${yellow}OCCT Stress Test ${normal}installed.
+  echo ---------------------------------------------
+  echo
+fi
+
 if [[ $user_choice = *"Lutris - Game launchereket, és egyéb appokat futtató környezet"* ]]; then
   echo
   echo ---------------------------------------------
@@ -420,7 +453,7 @@ if [[ $user_choice = *"Brave - webböngésző"* ]]; then
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}Brave${normal}
 
-  yay -S brave-bin --noconfirm
+  sudo pacman -S brave-bin --noconfirm
   cp -a /usr/local/bin/progs/BraveSoftware /home/$USER/.config/
 
   echo ${bold}${yellow}Brave ${normal}installed.
@@ -433,7 +466,7 @@ if [[ $user_choice = *"Librewolf - Firefox ESR alapú webböngésző"* ]]; then
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}Librewolf${normal}
 
-  yay -S librewolf-bin --noconfirm
+  sudo pacman -S librewolf librewolf-extension-gnome-shell-integration --noconfirm
   cp -a /usr/local/bin/progs/.librewolf/. /home/$USER/
   
   echo ${bold}${yellow}LibreWolf ${normal}installed.
@@ -444,11 +477,11 @@ fi
 if [[ $user_choice = *"Logitech, Roccat, Steelseries Eger Driver"* ]]; then
   echo
   echo ---------------------------------------------
-  echo Installing ${bold}${yellow}Librewolf${normal}
+  echo Installing ${bold}${yellow}Logitech, Roccat, Steelseries driver${normal}
 
   sudo pacman -S libratbag --noconfirm
   
-  echo ${bold}${yellow}LibreWolf ${normal}installed.
+  echo ${bold}${yellow}Logitech, Roccat, Steelseries driver ${normal}installed.
   echo ---------------------------------------------
   echo
 fi
@@ -458,7 +491,7 @@ if [[ $user_choice = *"FreeTube - Adatlopás-mentes YouTube-kliens"* ]]; then
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}FreeTube${normal}
 
-  yay -S freetube-bin --noconfirm
+  sudo pacman -S freetube --noconfirm
   cp -a /usr/local/bin/progs/FreeTube /home/$USER/.config/
  
   echo ${bold}${yellow}FreeTube ${normal}installed.
@@ -471,7 +504,7 @@ if [[ $user_choice = *"OnlyOffice - Legujabb MS Office Linuxos megfeleloje - LIB
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}OnlyOffice${normal}
 
-  yay -S onlyoffice-bin --noconfirm
+  sudo pacman -S onlyoffice-bin --noconfirm
 
   echo ${bold}${yellow}OnlyOffice ${normal}installed.
   echo ---------------------------------------------
@@ -483,7 +516,7 @@ if [[ $user_choice = *"DosBox - Régi, DOS-os játék emulátor"* ]]; then
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}DosBox Staging${normal}
 
-  yay -S dosbox-x --noconfirm
+  sudo pacman -S dosbox-x --noconfirm
 
   echo ${bold}${yellow}DosBox - Staging ${normal}installed.
   echo ---------------------------------------------
@@ -543,7 +576,7 @@ if [[ $user_choice = *"Spotify - Zenelejátszó Linuxra"* ]]; then
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}Spotify${normal}
 
-  yay -S spotify --noconfirm
+  sudo pacman -S spotify --noconfirm
 
   echo ${bold}${yellow}Spotify ${normal}installed.
   echo ---------------------------------------------
@@ -555,7 +588,7 @@ if [[ $user_choice = *"Spotube - Ingyenes Premium Spotify Zenelejátszó Linuxra
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}Spotube${normal}
 
-  yay -S spotube-bin --noconfirm
+  sudo pacman -S spotube-bin --noconfirm
 
   echo ${bold}${yellow}Spotube ${normal}installed.
   echo ---------------------------------------------
@@ -653,7 +686,7 @@ if [[ $user_choice = *"Tuta Email Kliens"* ]]; then
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}Tuta Email Desktop${normal}
 
-  yay -S tutanota-desktop-bin --noconfirm
+  sudo pacman -S tutanota-desktop --noconfirm
 
   echo ${bold}${yellow}Tuta Email Desktop ${normal}installed.
   echo ---------------------------------------------
@@ -702,7 +735,7 @@ if [[ $user_choice = *"ProtonUp-Qt - Proton verzio frissito alkalmazas"* ]]; the
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}ProtonUp-Qt${normal}
 
-  yay -S protonup-qt-bin --noconfirm
+  sudo pacman -S protonup-qt --noconfirm
 
   echo ${bold}${yellow}ProtonUp-Qt ${normal}installed.
   echo ---------------------------------------------
@@ -774,7 +807,7 @@ if [[ $user_choice = *"Vibrant - Szín szaturáció beállító program"* ]]; th
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}Vibrant${normal}
 
-  yay -S vibrantlinux --noconfirm
+  sudo pacman -S vibrantlinux --noconfirm
 
   echo ${bold}${yellow}Vibrant ${normal}installed.
   echo ---------------------------------------------
@@ -798,7 +831,7 @@ if [[ $user_choice = *"CZKAWKA - Duplikált képek és fájlok kiszűrése"* ]];
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}CZKAWKA${normal}
 
-  yay -S czkawka-gui-bin --noconfirm
+  sudo pacman -S czkawka-gui --noconfirm
 
   echo ${bold}${yellow}CZKAWKA ${normal}installed.
   echo ---------------------------------------------
@@ -838,7 +871,7 @@ if [[ $user_choice = *"Zenpower3 - AMD CPU Feszultseg, Aramerosseg es Fogyasztas
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}Zenpower3 - built from source${normal}
   
-  yay -S zenpower3-dkms --noconfirm
+  sudo pacman -S zenpower3-dkms --noconfirm
   sudo modprobe zenpower
   
   echo ${bold}${yellow}Zenpower3 ${normal}installed.
@@ -864,7 +897,7 @@ if [[ $user_choice = *"Double Commander - Total Commander Linuxos megfelelője"*
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}Double Commander${normal}
 
-  sudo pacman -S doublecmd-gtk2 --noconfirm
+  sudo pacman -S doublecmd-qt6 --noconfirm
 
   echo ${bold}${yellow}Double Commander ${normal}installed.
   echo ---------------------------------------------
@@ -883,24 +916,12 @@ if [[ $user_choice = *"Midnight Commander - 2 ablakos filekezelő"* ]]; then
   echo
 fi
 
-if [[ $user_choice = *"Monophony - Youtube videokbol kiszedi a hangot. Jo cucc podcastokhoz"* ]]; then
-  echo
-  echo ---------------------------------------------
-  echo Installing ${bold}${yellow}Monophony${normal}
-
-  yay -S monophony --noconfirm
-
-  echo ${bold}${yellow}Monophony ${normal}installed.
-  echo ---------------------------------------------
-  echo
-fi
-
 if [[ $user_choice = *"Jellyfin - Jellyfin Media Player"* ]]; then
   echo
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}Jellyfin${normal}
 
-  yay -S jellyfin-media-player --noconfirm
+  sudo pacman -S jellyfin-media-player --noconfirm
 
   echo ${bold}${yellow}Jellyfin Media Player ${normal}installed.
   echo ---------------------------------------------
@@ -912,7 +933,7 @@ if [[ $user_choice = *"XpadNeo - XBox Controller Support"* ]]; then
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}XPadNeo${normal}
 
-  yay -S xpadneo-dkms --noconfirm
+  sudo pacman -S xpadneo-dkms --noconfirm
 
   echo ${bold}${yellow}XPadNeo ${normal}installed.
   echo ---------------------------------------------
@@ -1003,8 +1024,7 @@ if [[ $user_choice = *"Helvum - Patchbay for PipeWire"* ]]; then
   echo 
 fi
 
-if [[ $user_choice = *"Hollywood - Agyad eldobod hacker leszel azonnal
+if [[ $user_choice = *"Hollywood - Agyad eldobod hacker leszel azonnal"* ]]; then
-"* ]]; then
   echo
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}Hollywood${normal}  
@@ -1016,8 +1036,7 @@ if [[ $user_choice = *"Hollywood - Agyad eldobod hacker leszel azonnal
   echo 
 fi
 
-if [[ $user_choice = *"BTOP - Rendszermonitorozo app (terminalos)
+if [[ $user_choice = *"BTOP - Rendszermonitorozo app (terminalos)"* ]]; then
-"* ]]; then
   echo
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}BTOP${normal}  
@@ -1065,6 +1084,7 @@ sudo chown -R $USER:$GROUP ~/
 # Cleanup
 
   sudo rm /etc/xdg/autostart/3progs.sh.desktop 2>/dev/null
+#test
 
 zenity --question --title='Restart required!' --text='Restart in 5 seconds?' --width='300' --height='100' 2>/dev/null
 if [ $? = 0 ]; then