Merge branch 'add-AUR-updates'

Author: Zadjad Rezai

.github/workflows/test-update.yml

@@ -2,35 +2,49 @@
 
 name: Test LinuxUpdate
 
-# Controls when the action will run. 
+# Controls when the action will run.
 on:
-  # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
+  ubuntu_check:
     runs-on: ubuntu-latest
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-    
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
-      # Runs a single command using the runners shell
+      - name: Install prerequisites
+        run: |
+          sudo apt update
+          sudo apt install bash sudo
+
       - name: Run ./LinuxUpdate.sh
         run: ./LinuxUpdate.sh
 
-      # Runs a set of commands using the runners shell
-      - name: Done
+  arch_check:
+    runs-on: ubuntu-latest
+    container:
+      image: archlinux:latest
+
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      # https://github.com/qutebrowser/qutebrowser/commit/478e4de7bd1f26bebdcdc166d5369b2b5142c3e2
+      - name: Workaround glibc issue
+        run: |
+          patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst && \
+          curl -LO "https://repo.archlinuxcn.org/x86_64/$patched_glibc" && \
+          bsdtar -C / -xvf "$patched_glibc"
+
+      - name: Install prerequisites
         run: |
-          echo Everything worked fine. :) 
+          pacman -Syyu --noconfirm
+          pacman -S sudo reflector --noconfirm
+
+      - name: Run ./LinuxUpdate.sh
+        run: ./LinuxUpdate.sh

LinuxUpdate.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -o pipefail
+
 RESET='\033[00m'
 RED='\033[01;31m'
 GREEN='\033[01;32m'
@@ -13,44 +15,31 @@ UNDERLINE='\033[4m'
 BASE_DISTRO=$(cat /etc/*release | grep -oP 'ID_LIKE=\K\w+')
 REAL_DISTRO=$(cat /etc/*release | grep -oP '^ID=\K\w+')
 
-if [ "$BASE_DISTRO" = "" ]; then
+if [[ -z "$BASE_DISTRO" ]]; then
     BASE_DISTRO=$REAL_DISTRO
 fi
 
 function update_arch_based_mirror_lists() {
-    if [ "$REAL_DISTRO" != "arch" ]; then
-        sudo pacman-mirrors --interactive --default
-    else
-        cp /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.backup
-        echo "/etc/pacman.d/mirrorlist -> /etc/pacman.d/mirrorlist.backup"
-        sed -i 's/^#Server/Server/' /etc/pacman.d/mirrorlist.backup
-        rankmirrors -n 6 /etc/pacman.d/mirrorlist.backup > /etc/pacman.d/mirrorlist
-    fi
+    reflector --verbose -l 5 --sort rate --save /etc/pacman.d/mirrorlist
 }
 
 function install_yay() {
     yay -Syu;
     if [ "$?" != 0 ]; then
-        read -p $'\033[1m\033[01;32m::\033[00m\033[1m Install yay? (y/n) \033[00m' -n 1 -r
-        case $REPLY in
-            y|Y)
-                echo -e "\n Installing yay - version 10.1.0"
-                mkdir /tmp/yay && cd /tmp/yay
-                curl -LJO https://github.com/Jguer/yay/releases/download/v10.1.0/yay_10.1.0_x86_64.tar.gz
-                tar xfz yay_10.1.0_x86_64.tar.gz
-                sudo mv yay_10.1.0_x86_64/yay /usr/local/bin/yay
-                rm -r -f yay*
-                yay -Syu;;
-            n|N)
-                echo "Okay.";;
-            *)
-                echo "Invalid";;
-        esac
+        echo -e "\033[1m\033[01;32m::\033[00m\033[1m Installing latest version of yay \033[00m"
+        mkdir /tmp/yay && cd /tmp/yay
+        ARCH=$(uname -m)
+        URL=$(curl -s https://api.github.com/repos/Jguer/yay/releases/latest | grep "browser_download_url.*${ARCH}.*tar.gz" | cut -d '"' -f 4 )
+        curl -LJ $URL -o yay.tar.gz
+        tar xfz yay.tar.gz
+        sudo mv yay*/yay /usr/local/bin/yay
+        rm -r -f yay*
+        yay -Syu
     fi
 }
 
 clear
-echo -e "${BOLD}Hi, $(whoami), I'm updating ${CYAN}${REAL_DISTRO} ${RESET}${BOLD}for you."
+echo -e "${BOLD}Hi, $(whoami), I'm updating ${CYAN}${REAL_DISTRO}${BOLD} ${RESET}for you."
 echo -e "${RESET}Please give me sudo-rights."
 echo
 
@@ -61,50 +50,38 @@ if [ "$BASE_DISTRO" = "arch" ]; then
 
     echo -e "${BOLD}Populating the keyring and refreshing it.. ${RESET}"
     echo
-    sudo pacman-key --populate archlinux "$REAL_DISTRO"
+
+    populate_keys="sudo pacman-key --populate archlinux"
+
+    echo $BASE_DISTRO
+    echo $REAL_DISTRO
+
+    if [[ $REAL_DISTRO != "arch" ]]; then
+        eval "$populate_keys $REAL_DISTRO"
+    else
+        eval $populate_keys
+    fi
+
     sudo pacman-key --refresh-keys
 
     echo
-    read -p $'\033[1m\033[01;32m::\033[00m\033[1m Do you want to update the mirrorlist? (y/n) \033[00m' -n 1 -r
+    echo "Updating the mirrorlist (uses 'reflector').."
     echo
-    case $REPLY in
-        y|Y)
-            echo "Updating the mirrorlist.."
-            echo
-            update_arch_based_mirror_lists;;
-        n|N)
-            echo "Okay, not updating mirrorlist.";;
-        * ) echo "Invalid";;
-    esac
-
-    sudo pacman -Syu
-    read -p $'\033[1m\033[01;32m::\033[00m\033[1m Do you want to update AUR packages (yay needed)? (y/n) \033[00m' -n 1 -r
-    echo
-    case $REPLY in
-        y|Y)
-            install_yay;;
-        n|N)
-            echo "Okay, not updating via AUR packages (via yay).";;
-        * ) echo "Invalid";;
-    esac
+    update_arch_based_mirror_lists;
     echo
 
-    read -p $'\033[1m\033[01;32m::\033[00m\033[1m Do you want to clear pacmans cache? (y/n)  \033[00m' -n 1 -r
+    sudo pacman -Syu --noconfirm
+
+    echo -e "\033[1m\033[01;32m::\033[00m\033[1m Updating AUR packages (yay will be installed, if not already there) \033[00m"
+    install_yay;
+
     echo
-    case $REPLY in
-        y|Y)
-            echo -e "${RED}Removing ${NONE}old stuff from your cache.."
-            echo
-            sudo pacman -Sc;;
-        n|N)
-            echo "Okay, not clearing pacmans cache.";;
-        * ) echo "Invalid";;
-    esac
+    echo -e "${RED}Removing ${NONE}old stuff from your cache.."
     echo
 
 elif [ "$BASE_DISTRO" = "debian" ]; then
-    sudo apt-get update
-    sudo apt-get full-upgrade
+    sudo apt update
+    sudo apt -y full-upgrade
 else
     echo -e "Sorry, I don't know how to update ${BASE_DISTRO}, yet."
     exit 1

README.md

@@ -1,7 +1,9 @@
 # LinuxUpdate
 
+[![LinuxUpdate on Ubuntu & Arch](https://github.com/Xcalizorz/LinuxUpdate/actions/workflows/test-update.yml/badge.svg)](https://github.com/Xcalizorz/LinuxUpdate/actions/workflows/test-update.yml)
+
 This is a small bash script that can update all Arch and Debian Distros, create a new mirrorlist and delete old stuff (only arch).
-I didn't like typing all the code in everytime, so I created a small bash script - 
+I didn't like typing all the code in everytime, so I created a small bash script -
 maybe you're like me and I can help you with this :)
 \
 The plan is to create an easy command-line tool for (almost) all Linux Distros.
@@ -22,6 +24,24 @@ Since I just started looking at bash, it might take a little bit to upload scrip
 
 ## Usage
 
+### Prerequisites
+
+#### Arch based
+
+Install the following packages, to make this script work:
+
+```bash
+  pacman -S sudo reflector
+```
+
+#### Debian based
+
+Install the following packages, to make this script work:
+
+```bash
+  apt install bash sudo
+```
+
 ### Use the cli
 
 ```bash
@@ -50,4 +70,4 @@ Now you have a shortcut and can start the update via double-click.
 
 ### Removing old stuff
 
-![Removing old stuff](img/removingStuff.png)
+![Removing old stuff](img/removingStuff.png)