From 5ee86b0366c191c427376d1cde541b42f704ca27 Mon Sep 17 00:00:00 2001
From: John Mertz <git@john.me.tz>
Date: Wed, 12 Apr 2023 21:30:03 -0400
Subject: [PATCH] Add dedicated alias file for each OS/Variant

Add a single 'upgrade' command which will do a full OS upgrade without
any prompts.
---
 bash/bash_aliases                   | 16 ++++++++++++++--
 bash/bash_aliases.arch              |  1 +
 bash/bash_aliases.debian            |  1 +
 bash/bash_aliases.fedora            |  1 +
 bash/bash_aliases.fedora-silverblue |  1 +
 bash/bash_aliases.ubuntu            |  1 +
 6 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 bash/bash_aliases.arch
 create mode 100644 bash/bash_aliases.debian
 create mode 100644 bash/bash_aliases.fedora
 create mode 100644 bash/bash_aliases.fedora-silverblue
 create mode 100644 bash/bash_aliases.ubuntu

diff --git a/bash/bash_aliases b/bash/bash_aliases
index c692bef94..7e85eef73 100644
--- a/bash/bash_aliases
+++ b/bash/bash_aliases
@@ -17,8 +17,6 @@ alias fuck='sudo "$BASH" -c "$(history -p !!)"'
 alias diff="diff --side-by-side --left-column -W \$COLUMNS"
 
 # OS functions (TODO: should be broken out and pulled in based on OS)
-alias apt-all="sudo apt-get update; sudo apt-get full-upgrade -y; sudo apt-get autoremove -y; sudo apt-get clean -y;"
-alias rpm-all="rpm-ostree upgrade"
 alias pip-upgrade="pip3 list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 pip3 install -U"
 
 # Legacy mappings
@@ -59,3 +57,17 @@ if [ "$(isdistrobox)" ]; then
 else
     source "$HOME/.dotfiles/bash/bash_aliases.host"
 fi
+
+if [ -f /etc/os-release ]; then
+    export OS=`grep -P '^ID=' /etc/os-release | cut -d'=' -f2 | sed 's/"//g'`
+    if [ -f ${HOME}/.dotfiles/bash/bash_aliases.$OS ]; then
+        source ${HOME}/.dotfiles/bash/bash_aliases.$OS
+    fi
+    OSVARIANT=`grep -P '^VARIANT_ID=' /etc/os-release | cut -d'=' -f2 | sed 's/"//g'`
+    if [ -z $OSVARIANT ]; then
+        export OSVARIANT
+    fi
+    if [ -f ${HOME}/.dotfiles/bash/bash_aliases.$OS-$OSVARIANT ]; then
+        source ${HOME}/.dotfiles/bash/bash_aliases.$OS-$OSVARIANT
+    fi
+fi
diff --git a/bash/bash_aliases.arch b/bash/bash_aliases.arch
new file mode 100644
index 000000000..784b50588
--- /dev/null
+++ b/bash/bash_aliases.arch
@@ -0,0 +1 @@
+alias upgrade="sudo pacman -Syyu --noconfirm"
diff --git a/bash/bash_aliases.debian b/bash/bash_aliases.debian
new file mode 100644
index 000000000..eaf074c83
--- /dev/null
+++ b/bash/bash_aliases.debian
@@ -0,0 +1 @@
+alias upgrade="sudo apt-get update; sudo apt-get full-upgrade -y; sudo apt-get autoremove -y; sudo apt-get clean -y;"
diff --git a/bash/bash_aliases.fedora b/bash/bash_aliases.fedora
new file mode 100644
index 000000000..a1bd61435
--- /dev/null
+++ b/bash/bash_aliases.fedora
@@ -0,0 +1 @@
+alias upgrade="sudo dnf upgrade -y"
diff --git a/bash/bash_aliases.fedora-silverblue b/bash/bash_aliases.fedora-silverblue
new file mode 100644
index 000000000..69bd2356c
--- /dev/null
+++ b/bash/bash_aliases.fedora-silverblue
@@ -0,0 +1 @@
+alias upgrade="sudo rpm-ostree upgrade"
diff --git a/bash/bash_aliases.ubuntu b/bash/bash_aliases.ubuntu
new file mode 100644
index 000000000..eaf074c83
--- /dev/null
+++ b/bash/bash_aliases.ubuntu
@@ -0,0 +1 @@
+alias upgrade="sudo apt-get update; sudo apt-get full-upgrade -y; sudo apt-get autoremove -y; sudo apt-get clean -y;"