added resolv.conf to backup script

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

ros-progs-gui.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
 
+# 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,8 +16,6 @@ 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
@@ -76,6 +75,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 +92,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ő" \
@@ -181,6 +182,18 @@ if [[ $user_choice = *"Systemd boot mod - 1sec varakozas bootolaskor"* ]]; then
   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 0/timeout 3/' /boot/loader/loader.conf
+
+  echo ${bold}${yellow}Systemd boot mod ${normal}installed.
+  echo ---------------------------------------------
+  echo
+fi
+
 if [[ $user_choice = *"Handbrake - Video konvertalo progi"* ]]; then
   echo
   echo ---------------------------------------------
@@ -306,6 +319,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 ---------------------------------------------