From d720665ffafaa52a1bf610bc5003a6638756197d Mon Sep 17 00:00:00 2001 From: Radical Date: Thu, 14 Mar 2024 20:17:23 -0500 Subject: [PATCH] Fix the pacdiff invocation so it correctly runs with sudo and with the colordiff environment variable --- ArchUpdater.sh | 4 ++-- README.md | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ArchUpdater.sh b/ArchUpdater.sh index 11e3763..fdd0e2e 100755 --- a/ArchUpdater.sh +++ b/ArchUpdater.sh @@ -2,7 +2,7 @@ cd "$(dirname "$0")" #Check to make sure colordiff installed for the pacdiff step, install it if not, and export it as the editor -export DIFFPROG=colordiff +#export DIFFPROG=colordiff colordiff_installed=$(which colordiff) if [ -z "$colordiff_installed" ]; then @@ -23,7 +23,7 @@ yay -Syu echo "Running pacdiff to check for any pacnew files that need to be dealt with" #Pacdiff to check for pacnews to deal with -pacdiff +sudo DIFFPROG=colordiff pacdiff #Update flatpaks echo "Running sudo update flatpak" diff --git a/README.md b/README.md index 267a0bf..32083c5 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,10 @@ # ArchUpdater -This is a simple update script for an arch linux system using Pacman, yay, and flatpak. \ No newline at end of file +This is a simple update script for an arch linux system using Pacman, yay, and flatpak. + + +--------- + +Usage: Clone the repo and run the script and that should be it. It does assume you are using yay as your AUR helper and that you use flatpak, but other than that it should need no additional dependencies + +It will install colordiff if you do not have it installed