From a1dac8d15c8ed553443b3eaa479cc072f4d5e3fa Mon Sep 17 00:00:00 2001
From: verita84 <verita84@noreply.localhost>
Date: Fri, 9 Dec 2022 21:05:22 +0000
Subject: [PATCH] Update 'debian.sh'

---
 debian.sh | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/debian.sh b/debian.sh
index f54b8c8..7d7594f 100755
--- a/debian.sh
+++ b/debian.sh
@@ -30,7 +30,7 @@ BOOT="/dev/$(lsblk | grep $HARD_DISK | head -3 | tail -1 | cut -c 7-20 | cut -d
 ROOT_NAME='debian'
 USB_BACKUP='/dev/disk/by-uuid/1a143f83-d4fe-4894-8e67-2b6d3baacea6'
 ######################################
-USER="123456"
+USER="verita84"
 USER_PASSWORD="123456"
 ROOT_PASSWORD="123456"
 WIRELESS_PASSWORD='123456'
@@ -38,13 +38,13 @@ SSID='123456'
 WIRELESS_INTERFACE='wlan0'
 DISK_PASSWORD='123456'
 COMPRESSION='compress=zlib:9'
-DEBIAN_RELEASE='sid'
-
+DEBIAN_RELEASE='testing'
 FLATPAKS+=( app/net.brinkervii.grapejuice app/org.gnome.Photos app/org.mozilla.firefox org.gnome.Evolution app/com.vscodium.codium app/org.libreoffice.LibreOffice org.gajim.Gajim org.gajim.Gajim.Plugin.omemo org.telegram.desktop app/im.riot.Riot app/io.mpv.Mpv app/org.gimp.GIMP fr.handbrake.ghb org.kde.kdenlive )
 
 #Packages
 SHARED_DESKTOP_APPS=" gnome-core yt-dlp "
-PACKAGES=" zram-tools systemd-zram-generator samba samba-common nfs-common nfs-kernel-server linux-cpupower locales syncthing redis aardvark-dns cockpit cockpit-machines cockpit-podman flatpak powertop blueman cups acpi packagekit cockpit-packagekit cockpit-pcp cockpit-storaged acpid podman podman-compose pulseaudio aardvark-dns ghostscript cifs-utils ntp vim-airline rsync screen base udev git network-manager efibootmgr linux-headers-amd64 cryptsetup network-manager-openvpn ntp screen docbook-xsl alsa-utils sysstat postgresql redis neofetch podman-toolbox fuse3 build-essential unzip bash-completion parted dosfstools wget curl "
+PACKAGES=" zram-tools samba samba-common nfs-common nfs-kernel-server linux-cpupower locales syncthing redis aardvark-dns cockpit cockpit-machines cockpit-podman flatpak powertop blueman cups acpi packagekit cockpit-packagekit cockpit-pcp cockpit-storaged acpid podman pulseaudio aardvark-dns ghostscript cifs-utils ntp vim-airline rsync screen base udev git network-manager efibootmgr linux-headers-amd64 cryptsetup network-manager-openvpn ntp screen docbook-xsl alsa-utils sysstat postgresql redis neofetch fuse3 build-essential unzip bash-completion parted dosfstools wget curl "
+#REMOVED=" podman-compose systemd-zram-generator podman-toolbox "
 VIRTUALIZATION=" virt-manager qemu-system libvirt-daemon-system ovmf "
 PACKAGES=$PACKAGES$SHARED_DESKTOP_APPS$VIRTUALIZATION
 SERVICES+=( powertop );
@@ -93,8 +93,11 @@ usb-backup() {
 
     echo;echo "[Mounting $USB_BACKUP]";echo
     mount $USB_BACKUP $TARGET
-
-    homeBackup
+    
+    if [ "$2" = "home" ]; then
+        homeBackup
+    fi
+    
     clean-old-snapshots "$1"
     clean-old-usb-snapshots "$1"
     create-usb-snapshots "$1"
@@ -109,6 +112,11 @@ usb-backup() {
 usb-restore() {
     partitions
     rsync -av ../$ROOT_NAME-$2/ $TARGET/ --exclude=/home --delete
+
+    if [ "$2" = "home" ]; then
+        rsync -av --delete ../home/ $TARGET/home/ 
+    fi
+
     cp -rf ../efi-$2/* $TARGET/boot/
     fstab
     cp -f debian.sh $TARGET/
@@ -119,7 +127,6 @@ usb-restore() {
     unmount
 }
 
-
 systemMounts(){
     mount -o bind /dev $TARGET/dev
     mount -o bind /dev/pts $TARGET/dev/pts
@@ -148,7 +155,6 @@ install() {
     custom_service_files
     services
     btrfs-tweaks
-    cpuPower
     setup_script "$1"
     unmount
 }
@@ -390,7 +396,7 @@ show-help() {
     echo "debian.sh arguments:"
     echo
     echo "./debian.sh install [disk]"
-    echo "./debian.sh backup [device name]"
+    echo "./debian.sh backup [device name] [home]"
     echo "./debian.sh restore [disk] [backup name]"
     echo "./debian.sh chroot [disk]"
     echo "./debian.sh wifi"
@@ -423,7 +429,7 @@ elif [ "$1" = "bootloader" ]; then
 elif [ "$1" = "snapshot" ]; then
     snapshots
 elif [ "$1" = "backup" ]; then
-    usb-backup "$2"
+    usb-backup "$2" "$3"
 elif [ "$1" = "grub-snapshots" ]; then
     grub-snapshots
 elif [ "$1" = "btrfs-tweaks" ]; then