Fix the pacdiff invocation so it correctly runs with sudo and with the colordiff environment variable
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
cd "$(dirname "$0")"
|
cd "$(dirname "$0")"
|
||||||
|
|
||||||
#Check to make sure colordiff installed for the pacdiff step, install it if not, and export it as the editor
|
#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)
|
colordiff_installed=$(which colordiff)
|
||||||
|
|
||||||
if [ -z "$colordiff_installed" ]; then
|
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"
|
echo "Running pacdiff to check for any pacnew files that need to be dealt with"
|
||||||
|
|
||||||
#Pacdiff to check for pacnews to deal with
|
#Pacdiff to check for pacnews to deal with
|
||||||
pacdiff
|
sudo DIFFPROG=colordiff pacdiff
|
||||||
|
|
||||||
#Update flatpaks
|
#Update flatpaks
|
||||||
echo "Running sudo update flatpak"
|
echo "Running sudo update flatpak"
|
||||||
|
|||||||
@@ -1,3 +1,10 @@
|
|||||||
# ArchUpdater
|
# ArchUpdater
|
||||||
|
|
||||||
This is a simple update script for an arch linux system using Pacman, yay, and flatpak.
|
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
|
||||||
|
|||||||
Reference in New Issue
Block a user