From f122c5aff7dcb378dcc12a6b4bf85c0fd9088a39 Mon Sep 17 00:00:00 2001 From: TNE Date: Sat, 16 Oct 2021 21:29:41 +0200 Subject: [PATCH] Outsource update script to garuda-update --- PKGBUILD | 3 ++- usr/bin/update | 73 -------------------------------------------------- 2 files changed, 2 insertions(+), 74 deletions(-) delete mode 100755 usr/bin/update diff --git a/PKGBUILD b/PKGBUILD index 3231907..7c6bd2b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Librewish pkgname=garuda-common-settings -pkgver=2.1.2 +pkgver=2.2.0 pkgrel=1 arch=('any') url="https://gitlab.com/garuda-linux/themes-and-settings/settings/$pkgname" @@ -14,6 +14,7 @@ depends=('btrfsmaintenance' 'garuda-browser-settings' 'garuda-hooks' 'garuda-icons' + 'garuda-update' 'ananicy-cpp' 'ananicy-rules-git' 'haveged' diff --git a/usr/bin/update b/usr/bin/update deleted file mode 100755 index 9429845..0000000 --- a/usr/bin/update +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash -set -e - -# Run the "I'm too lazy to fix it myself all in one" script -if [ "$1" == "remote" ]; then - exec sudo bash -c "VERSION=2 . <(wget -qO- https://gitlab.com/garuda-linux/themes-and-settings/settings/garuda-common-settings/-/snippets/2147440/raw/main/remote-update) \"$2\"" -fi - -# Check for AUR helper -if [ -x /usr/bin/paru ] && [[ $EUID -ne 0 ]]; then - upd_cmd="paru -Su" - echo "Detected Paru, using it to update the system.." -elif [ -x /usr/bin/yay ] && [[ $EUID -ne 0 ]]; then - upd_cmd="yay -Su" - echo "Detected Yay, using it to update the system.." -else - upd_cmd="sudo pacman -Su" - if [[ $EUID -ne 0 ]]; then - echo "No AUR helper installed, using Pacman to update.." - else - echo "Executed as root, using Pacman to update.." - fi -fi - -if [ -x /usr/bin/reflector ]; then - # Refresh mirrorlist - echo "Refreshing mirrorlists.." - sudo reflector --latest 5 --age 2 --fastest 5 --protocol https --sort rate --save /etc/pacman.d/mirrorlist && cat /etc/pacman.d/mirrorlist || { echo -e "\033[1;31m\nFailed to update mirrorlist\n\033[0m"; } -fi - -echo "" - -# Check for keyring update & update as needed -echo "Checking for keyring update before starting full system update.." -if pacman -Qq blackarch-keyring &> /dev/null; then - sudo pacman -Sy archlinux-keyring blackarch-keyring chaotic-keyring --needed && $upd_cmd || false -else - sudo pacman -Sy archlinux-keyring chaotic-keyring --needed && $upd_cmd || false -fi -echo "" - -# Update pacman Files database -sudo pacman -Fy -echo "" - -# Update mlocate index -if [ -x /usr/bin/locate ]; then - echo "Updating mlocate index.." - sudo updatedb -fi -echo "" - -# Update fish completions -if [ -x /usr/bin/fish ]; then - if [[ $EUID -ne 0 ]]; then - fish -c fish_update_completions - elif [ ! -z "$SUDO_UID" ]; then - sudo -u \#$SUDO_UID fish -c fish_update_completions - fi -fi -echo "" - -# Update micro plugins -if [ -x /usr/bin/micro ]; then - if [[ $EUID -ne 0 ]]; then - micro -plugin update - elif [ ! -z "$SUDO_UID" ]; then - sudo -u \#$SUDO_UID micro -plugin update - fi -fi - -echo "" -echo "System updated! 🐧"