forgor #7

Merged
AustrianToast merged 4 commits from dev into main 2023-02-01 02:14:17 +01:00
3 changed files with 14 additions and 12 deletions

View File

@ -26,10 +26,7 @@ no flag same as -a
-g shutdowns the computer afterwards (needs to be the last or only option to work properly) -g shutdowns the computer afterwards (needs to be the last or only option to work properly)
-r reboots the computer afterwards (needs to be the last or only option to work properly) -r reboots the computer afterwards (needs to be the last or only option to work properly)
``` ```
## Roadmap
- Publish to the aur
- First time setup
## Contributing ## Contributing
Contributions are always welcome! Contributions are always welcome!

View File

@ -1,4 +1,4 @@
VER = "v1.3" VER = "v1.4"
install: install:
@echo "==> Installing update $(VER)..." @echo "==> Installing update $(VER)..."

21
update
View File

@ -1,9 +1,10 @@
#!/bin/bash #!/bin/bash
# updates using a pacman-wrapper and flatpak-update with flags # updates using a pacman-wrapper and flatpak-update with flags
# version 1.3 # version 1.4
IGreen="\033[0;92m" # Green IGREEN="\033[0;92m" # Intense Green
IYELLOW="\033[0;93m" # Intense Red
NC="\033[0m" # Text Reset NC="\033[0m" # Text Reset
TMP="/tmp/backup" TMP="/tmp/backup"
@ -26,9 +27,11 @@ Help() {
# it then rsyncs the tar to the backup location # it then rsyncs the tar to the backup location
before_backup() { before_backup() {
[[ ! -d /tmp/backup ]] && mkdir /tmp/backup [[ ! -d /tmp/backup ]] && mkdir /tmp/backup
pacman -Q > "${TMP}"/pacman-pre.txt pacman -Q > "${TMP}"/pacman-pre.txt
flatpak list > "${TMP}"/flatpak-pre.txt flatpak list > "${TMP}"/flatpak-pre.txt
sudo touch /var/lib/pacman/db.lck
tar -cJf "${TMP}"/before-backup.tar.xz.new "${TMP}"/pacman-pre.txt "${TMP}"/flatpak-pre.txt /var/lib/pacman/local &> /dev/null tar -cJf "${TMP}"/before-backup.tar.xz.new "${TMP}"/pacman-pre.txt "${TMP}"/flatpak-pre.txt /var/lib/pacman/local &> /dev/null
sudo rm /var/lib/pacman/db.lck
rsync "${TMP}"/before-backup.tar.xz.new "${backup_location}" rsync "${TMP}"/before-backup.tar.xz.new "${backup_location}"
rename before-backup.tar.xz.new before-backup.tar.xz "${backup_location}"/before-backup.tar.xz.new rename before-backup.tar.xz.new before-backup.tar.xz "${backup_location}"/before-backup.tar.xz.new
} }
@ -56,11 +59,13 @@ update_with_flatpak() {
[[ $1 = --help ]] && Help && exit 0; [[ $1 = --help ]] && Help && exit 0;
while [ -f /var/lib/pacman/db.lck ]; do { while [ -f /var/lib/pacman/db.lck ]; do {
sleep 1s echo -e "${IYELLOW}->${NC} /var/lib/pacman/db.lck exists"
echo -e "${IYELLOW}->${NC} there might be an instance of pacman running. exiting..."
exit 1
} }
done done
before_backup && echo -e "${IGreen} pre-backup complete ${NC}" before_backup && echo -e "${IGREEN}pre-backup complete${NC}"
[[ -z $1 ]] && update_with_pacman_wrapper && update_with_flatpak; [[ -z $1 ]] && update_with_pacman_wrapper && update_with_flatpak;
while getopts 'fpagr' OPTIONS; do while getopts 'fpagr' OPTIONS; do
@ -73,14 +78,14 @@ while getopts 'fpagr' OPTIONS; do
update_with_pacman_wrapper; update_with_flatpak ;; update_with_pacman_wrapper; update_with_flatpak ;;
g) g)
[[ $1 = -g ]] && update_with_pacman_wrapper && update_with_flatpak; [[ $1 = -g ]] && update_with_pacman_wrapper && update_with_flatpak;
after_backup && echo -e "${IGreen} after-backup complete ${NC}" && sleep 3s && shutdown now ;; after_backup && echo -e "${IGREEN}after-backup complete${NC}" && sleep 3s && shutdown now ;;
r) r)
[[ $1 = -r ]] && update_with_pacman_wrapper && update_with_flatpak; [[ $1 = -r ]] && update_with_pacman_wrapper && update_with_flatpak;
after_backup && echo -e "${IGreen} after-backup complete ${NC}" && sleep 3s && reboot ;; after_backup && echo -e "${IGREEN}after-backup complete${NC}" && sleep 3s && reboot ;;
?) ?)
Help Help
exit 1;; exit 1;;
esac esac
done done
after_backup && echo -e "${IGreen} after-backup complete ${NC}" after_backup && echo -e "${IGREEN}after-backup complete${NC}"