diff --git a/debian.sh b/debian.sh index f6461e0..8581160 100755 --- a/debian.sh +++ b/debian.sh @@ -3,24 +3,25 @@ #Configure this section ######################## TARGET='/install' +mkdir $TARGET ###################################### echo -HARD_DISK=nvme0n1 -EFI="/dev/${HARD_DISK}p1" -BOOT="/dev/${HARD_DISK}p2" -BTRFS="/dev/${HARD_DISK}p3" +HARD_DISK=$2 +EFI="/dev/$(lsblk | grep $HARD_DISK | head -2 | tail -1 | cut -c 7-20 | cut -d ' ' -f1)" +BTRFS="/dev/$(lsblk | grep $HARD_DISK | head -4 | tail -1 | cut -c 7-20 | cut -d ' ' -f1)" +BOOT="/dev/$(lsblk | grep $HARD_DISK | head -3 | tail -1 | cut -c 7-20 | cut -d ' ' -f1)" ROOT_NAME='debian' -USB_BACKUP='/dev/disk/by-uuid/a5244cfe-308f-45e7-a7ff-b69c9407866e' +USB_BACKUP='/dev/disk/by-uuid/be22aef7-2d82-4078-86d5-07ef298fa367' ###################################### USER="verita84" USER_PASSWORD="123456" ROOT_PASSWORD="123456" WIRELESS_PASSWORD='123456' -SSID='Tribble' +SSID='123456' WIRELESS_INTERFACE='wlan0' DISK_PASSWORD='123456' -FLATPAKS+=( 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 ) +FLATPAKS+=( 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 " @@ -70,7 +71,7 @@ copy-efi-to-usb(){ homeBackup() { echo;echo "[Copying USER data....]";echo - rsync -av --delete /home/ /mnt/home/ + rsync -av --delete /home/ $TARGET/home/ } usb-backup() { @@ -135,6 +136,7 @@ install() { services btrfs-tweaks cpuPower + hosts setup_script unmount } @@ -284,9 +286,9 @@ partitions() { echo echo "Formatting $EFI" echo - #echo y | mkfs.vfat $EFI + echo y | mkfs.vfat $EFI echo "Formatting $BOOT" - #echo y | mkfs.ext4 $BOOT + echo y | mkfs.ext4 $BOOT mounts @@ -386,13 +388,13 @@ show-help() { echo echo "debian.sh arguments:" echo - echo "./debian.sh install" + echo "./debian.sh install [disk]" echo "./debian.sh backup [device name]" echo "./debian.sh restore [device name" echo "./debian.sh chroot" echo "./debian.sh wifi" echo "./debian.sh bootloader" - echo "./debian.sh initialize" + echo "./debian.sh initialize [disk]" echo "./debian.sh snapshot" echo "./debian.sh reomve-snapshot" echo "./debian.sh btrfs-tweaks" @@ -400,7 +402,7 @@ show-help() { } if [ "$1" = "install" ]; then - install "$2" + install elif [ "$1" = "desktop" ]; then desktop elif [ "$1" = "kernel-packages" ]; then