From a4ca632c58d59739caa5ba1b957ea0ad94da2fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Fuhry?= Date: Tue, 10 Jan 2023 19:20:34 +0100 Subject: [PATCH 1/2] added help long option --- update | 5 ++++- update.conf | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/update b/update index c9dcd9c..0d1bda9 100644 --- a/update +++ b/update @@ -2,7 +2,7 @@ # shellcheck source=/dev/null # updates via an aur-helper and flatpak with flags -# version 0.7 +# version 0.8 # add options to change aur-helper in the config # maybe make a first time setup, which asks for backup_location and aur_helper, maybe even if you wanna opt-in to non-interactive flatpak-update (maybe a flag?) @@ -26,6 +26,7 @@ Help() { echo "-a updates using flatpak update and an aur-helper" echo "-g shutdowns the computer afterwards (needs to be the last or only option to work properly)" echo "-r reboots the computer afterwards (needs to be the last or only option to work properly)" + echo "--help shows usage" } # creates package lists, moves them into a zip, adds some other files to the zip and backups the pacman database in the form of a tar @@ -60,6 +61,8 @@ update_with_flatpak() { flatpak list > ~/flatpak-after.txt } +[[ $1 = --help ]] && Help && exit 0; + before_backup && echo -e "${IGreen} pre-backup complete ${NC}" [[ -z $1 ]] && update_with_aur_helper && update_with_flatpak; diff --git a/update.conf b/update.conf index b9d5b66..74309cb 100644 --- a/update.conf +++ b/update.conf @@ -1,5 +1,5 @@ # Backup to this folder -backup_location=~/ +backup_location=~/balls # use this aur-helper -aur_helper=yay +aur_helper=paru -- 2.45.2 From 13db9ed5bcf00b8cdcb0546e9cffa6bd2a62b883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Fuhry?= Date: Sat, 14 Jan 2023 22:36:20 +0100 Subject: [PATCH 2/2] Add files via upload --- makefile | 4 ++-- update | 45 +++++++++++++++++++++------------------------ update.conf | 2 +- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/makefile b/makefile index 34d238c..22b4740 100644 --- a/makefile +++ b/makefile @@ -1,10 +1,10 @@ install: - @echo "==> Installing update v0.4..." + @echo "==> Installing update v1.0..." @sudo install -Dm755 update /usr/local/bin/update @cp update.conf ${HOME}/.config/ @echo "==> Finished." uninstall: - @echo "==> Uninstalling update v0.4..." + @echo "==> Uninstalling update v1.0..." @sudo rm /usr/local/bin/update ${HOME}/.config/update.conf @echo "==> Finished." diff --git a/update b/update index 0d1bda9..222604a 100644 --- a/update +++ b/update @@ -1,16 +1,13 @@ #!/bin/bash -# shellcheck source=/dev/null # updates via an aur-helper and flatpak with flags -# version 0.8 - -# add options to change aur-helper in the config -# maybe make a first time setup, which asks for backup_location and aur_helper, maybe even if you wanna opt-in to non-interactive flatpak-update (maybe a flag?) - +# version 1.0 IGreen="\033[0;92m" # Green NC="\033[0m" # Text Reset +dir="$pwd" + source ~/.config/update.conf # output if wrong flag is used @@ -26,44 +23,44 @@ Help() { echo "-a updates using flatpak update and an aur-helper" echo "-g shutdowns the computer afterwards (needs to be the last or only option to work properly)" echo "-r reboots the computer afterwards (needs to be the last or only option to work properly)" - echo "--help shows usage" } # creates package lists, moves them into a zip, adds some other files to the zip and backups the pacman database in the form of a tar # it then rsyncs the zip and the tar to the backup location before_backup() { - paclog-pkglist > ~/pacman-pre.txt - flatpak list > ~/flatpak-pre.txt - zip --quiet --move ~/before_backup.zip.new ~/pacman-pre.txt ~/flatpak-pre.txt - zip --quiet --grow ~/before_backup.zip.new /etc/fstab /etc/makepkg.conf - tar -cJf ~/pacman_database.tar.xz.new /var/lib/pacman/local &> /dev/null - rsync --remove-source-files ~/before_backup.zip.new ~/pacman_database.tar.xz.new "$backup_location" - rename before_backup.zip.new before_backup.zip "$backup_location"/before_backup.zip.new - rename pacman_database.tar.xz.new pacman_database.tar.xz "$backup_location"/pacman_database.tar.xz.new + paclog-pkglist > pacman-pre.txt + flatpak list > flatpak-pre.txt + zip --quiet --move before-backup.zip.new pacman-pre.txt flatpak-pre.txt + zip --quiet --grow before-backup.zip.new /etc/fstab /etc/makepkg.conf + tar -cJf pacman-database.tar.xz.new /var/lib/pacman/local &> /dev/null + rsync --remove-source-files before-backup.zip.new pacman-database.tar.xz.new "$backup_location" + rename before-backup.zip.new before-backup.zip "$backup_location"/before-backup.zip.new + rename pacman-database.tar.xz.new pacman-database.tar.xz "$backup_location"/pacman-database.tar.xz.new } # moves the package lists into a zip, it then rsyncs the zip to the backup location after_backup() { - zip --quiet --move ~/after_backup.zip.new ~/pacman-after.txt ~/flatpak-after.txt - rsync --remove-source-files ~/after_backup.zip.new "$backup_location" - rename after_backup.zip.new after_backup.zip "$backup_location"/after_backup.zip.new + zip --quiet --move after-backup.zip.new pacman-after.txt flatpak-after.txt + rsync --remove-source-files after-backup.zip.new "$backup_location" + rename after-backup.zip.new after-backup.zip "$backup_location"/after-backup.zip.new } # updates using aur-helper update_with_aur_helper() { "$aur_helper" - paclog-pkglist > ~/pacman-after.txt + paclog-pkglist > pacman-after.txt } # updates using flatpak update update_with_flatpak() { flatpak update -u --noninteractive - flatpak list > ~/flatpak-after.txt + flatpak list > flatpak-after.txt } [[ $1 = --help ]] && Help && exit 0; -before_backup && echo -e "${IGreen} pre-backup complete ${NC}" +[[ ! -d /tmp/backup ]] && mkdir /tmp/backup; +cd /tmp/backup && before_backup && echo -e "${IGreen} pre-backup complete ${NC}" [[ -z $1 ]] && update_with_aur_helper && update_with_flatpak; while getopts 'fyagr' OPTION; do @@ -76,14 +73,14 @@ while getopts 'fyagr' OPTION; do update_with_aur_helper; update_with_flatpak ;; g) [[ $1 = -g ]] && update_with_aur_helper && update_with_flatpak; - after_backup && echo -e "${IGreen} after-backup complete ${NC}" && sleep 3s && shutdown now ;; + after_backup && cd "$dir"; echo -e "${IGreen} after-backup complete ${NC}" && sleep 3s && shutdown now ;; r) [[ $1 = -r ]] && update_with_aur_helper && update_with_flatpak; - after_backup && echo -e "${IGreen} after-backup complete ${NC}" && sleep 3s && reboot ;; + after_backup && cd "$dir"; echo -e "${IGreen} after-backup complete ${NC}" && sleep 3s && reboot ;; ?) Help exit 1;; esac done -after_backup && echo -e "${IGreen} after-backup complete ${NC}" +after_backup && cd "$dir"; rm -r /tmp/backup; echo -e "${IGreen} after-backup complete ${NC}" diff --git a/update.conf b/update.conf index 74309cb..53e4090 100644 --- a/update.conf +++ b/update.conf @@ -1,5 +1,5 @@ # Backup to this folder -backup_location=~/balls +backup_location=~/ # use this aur-helper aur_helper=paru -- 2.45.2