diff --git a/.bash/.aliases.sh b/.bash/.aliases.sh index 9ae6e80..d272e3a 100644 --- a/.bash/.aliases.sh +++ b/.bash/.aliases.sh @@ -1,19 +1,3 @@ -# ─< Check if the user is root and set sudo variable if necessary >─────────────────────── -check_root() { - if [ "$(id -u)" -ne 0 ]; then - if command_exists sudo; then - echo_warning "User is not root. Using sudo for privileged operations." - _sudo="sudo" - else - echo_error "No sudo found and you're not root! Can't install packages." - return 1 - fi - else - echo_info "Root access confirmed." - _sudo="" - fi -} - __autopackager__() { . /etc/os-release case "$ID" in @@ -21,16 +5,16 @@ __autopackager__() { ubuntu | debian | pop | kali | zorin | rhinoh | raspbian) if command_exists nala; then alias search="nala search" - alias install="$_sudo nala install --assume-yes" - alias update="$_sudo nala update && $_sudo nala upgrade --full" - alias remove="$_sudo nala purge" + alias install="\$_sudo nala install --assume-yes" + alias update="\$_sudo nala update && \$_sudo nala upgrade --full" + alias remove="\$_sudo nala purge" else alias search="apt-cache search" - alias install="$_sudo apt-get install --yes" - alias update="$_sudo apt-get update && $_sudo apt-get upgrade" - alias remove="$_sudo apt-get purge" + alias install="\$_sudo apt-get install --yes" + alias update="\$_sudo apt-get update && \$_sudo apt-get upgrade" + alias remove="\$_sudo apt-get purge" fi - alias unbreak="$_sudo dpkg --configure -a" + alias unbreak="\$_sudo dpkg --configure -a" ;; # Arch-based @@ -46,34 +30,34 @@ __autopackager__() { alias update="yay -Syu" alias remove="yay -R" else - alias search="$_sudo pacman -Ss" - alias install="$_sudo pacman -S --noconfirm" - alias update="$_sudo pacman -Syu" - alias remove="$_sudo pacman -R" + alias search="\$_sudo pacman -Ss" + alias install="\$_sudo pacman -S --noconfirm" + alias update="\$_sudo pacman -Syu" + alias remove="\$_sudo pacman -R" fi ;; # RHEL-based fedora | centos) alias search="dnf search" - alias install="$_sudo dnf install" - alias update="$_sudo dnf update" - alias remove="$_sudo dnf remove" + alias install="\$_sudo dnf install" + alias update="\$_sudo dnf update" + alias remove="\$_sudo dnf remove" ;; # openSUSE opensuse-*) alias search="zypper search" - alias install="$_sudo zypper install --no-confirm" - alias update="$_sudo zypper update" - alias remove="$_sudo zypper remove" + alias install="\$_sudo zypper install --no-confirm" + alias update="\$_sudo zypper update" + alias remove="\$_sudo zypper remove" ;; # Alpine alpine) - alias install="$_sudo apk add" - alias update="$_sudo apk update && $_sudo apk upgrade" - alias remove="$_sudo apk del" + alias install="\$_sudo apk add" + alias update="\$_sudo apk update && \$_sudo apk upgrade" + alias remove="\$_sudo apk del" ;; esac } @@ -268,7 +252,7 @@ _alias() { # ─< wireshark / termshark alias >──────────────────────────────────────────────────────── if command_exists termshark; then - alias ws="$_sudo termshark" + alias ws="\$_sudo termshark" fi }