README.md

@@ -1,28 +1,15 @@
 # pman.sh
-A `pacman` helper script, because you forget all the stupid flags
+A `pacman` helper script, because you forget the stupid flags
 
 ## Usage / Features:
-- aur/yay
 - search
-- info
-- localinfo
-- provides
-- providefiles
-- installed
-- install
 - update
 - upgradable
 - upgrade
-- remove
+- install
-- purge
+- provides
-- clean
-- reflector
 - config
 
-`reflector` and `config` are the only flag that are not appended to `pacman` (or `yay`)<br>
+`config` is the only flag that is not appended to `pacman`, instead it resolves to `nano /etc/pacman.conf`.
-instead `reflector` resolves to `reflector` with the previously used parameters stored in `/etc/pacman.d/mirrorlist`<br>
-and `config` resolves to `nano /etc/pacman.conf`.
 
-`sudo` gets prepended automatically if the command requires root privileges, if the UID is not 0 (you are not `root`) and if `sudo` installed.<br>
+`sudo` gets prepended automatically if the command requires it and if installed - no, there is no check if your user is in the `sudo` group, if you download this script you should already be, or know you can only use part of this utility
-no, there is no check if your user is in the `sudo` group, if you download this script you should already be, or know you can only use part of this utility<br>
-tho such a feature is planned, to make the script truly ubiquitus.

pman.sh

@@ -7,26 +7,8 @@ command=""
 more_arguments=false
 su_needed=false
 
-# If sudo is needed and necessary (and installed), prepend it, if not installed throw error
-check_sudo() {
-  if [ "$su_needed" = "true" ] && [ "$UID" != 0 ]; then
-    if command -v "sudo" &>/dev/null; then
-      command="sudo $command"
-    else
-      echo "sudo command needed but not found" > /dev/stderr
-      exit 1
-    fi
-  fi
-}
-
-# Execute the command
-execute_command() {
-  check_sudo
-  $command $command_args "${@}"
-}
-
 # Check if yay (aur)
-if [ "$command_args" = "yay" ] || [ "$command_args" = "aur" ]; then
+if [ "$command_args" = "yay" ]; then
   command="yay"
   command_args="$1"
   shift
@@ -36,15 +18,6 @@ elif [ "$command_args" = "config" ]; then
   command="nano"
   command_args="/etc/pacman.conf"
   su_needed=true
-elif [ "$command_args" = "reflector" ]; then
-  command="reflector"
-  command_args=$(cat /etc/pacman.d/mirrorlist 2>/dev/null | grep -e "With.*reflector" | sed 's/#.*reflector //')
-  # Check if reflector was actually used to generate the mirrorlist
-  if [ "$command_args" = "" ]; then
-    echo "Error: reflector was not used to generate mirrorlist or mirrorlist location differ from standard"
-    exit 1
-  fi
-  su_needed=true
 fi
 
 # If command is empty, command is pacman
@@ -54,111 +27,47 @@ if [ "$command" = "" ]; then
 fi
 
 # Evaluate the command arguments
-case "$command_args" in
+if [ "$command_args" = "search" ]; then
-  "search")
+  command_args="-Ss"
-    command_args="-Ss"
+elif [ "$command_args" = "update" ]; then
-    ;;
+  command_args="-Sy"
-  "info")
+  if [ "$command" = "pacman" ]; then
-    command_args="-Si"
-    ;;
-  "localinfo")
-    command_args="-Qi"
-    ;;
-  "provides")
-    # Update the cache
     su_needed=true
-    command_args="-Fy"
+  fi
-    execute_command "${@}"
+elif [ "$command_args" = "upgradable" ]; then
-
+  command_args="-Qu"
-    su_needed=false
+elif [ "$command_args" = "upgrade" ]; then
-    command_args="-F"
+  command_args="-Syu"
-    ;;
+  if [ "$command" = "pacman" ]; then
-  "providefiles")
-    # Update the cache
     su_needed=true
-    command_args="-Fy"
+  fi
-    execute_command "${@}"
+elif [ "$command_args" = "install" ]; then
+  command_args="-S"
+  if [ "$command" = "pacman" ]; then
+    su_needed=true
+  fi
+elif [ "$command_args" = "provides" ]; then
+  command_args="-F"
+elif [ "$more_arguments" = "true" ]; then
+  echo "Invalid command: \"$command $command_args\""
+  echo
+  echo "Usage: pman <command> [args...]"
+  echo "Available commands:"
+  echo "  yay (aur)  - yay              | invoke yay "
+  echo "               (aur packages - all the normal operations except config are available)"
+  echo "  aur (yay)  - yay              | same as \"yay\""
+  echo "  search     - pacman -Ss       | search packages"
+  echo "  update     - pacman -Sy       | updates the repositories"
+  echo "  upgradable - pacman -Qu       | list available upgrades"
+  echo "  upgrade    - pacman -Syu      | upgrades your system"
+  echo "  provides   - pacman -F        | list packages that provide file"
+  echo "  config     - /etc/pacman.conf | edits pacman configuration"
+  exit 1
+fi
 
-    su_needed=false
+# If sudo is needed and necessary (and installed), prepend it
-    command_args="-Fl"
+if [ "$su_needed" = "true" ] && [ "$UID" != 0 ] && command -v "sudo" &>/dev/null; then
-    ;;
+  sudo $command $command_args "${@}"
-  "installed")
+else
-    command_args="-Q"
+  $command $command_args "${@}"
-    ;;
+fi
-  "install")
-    command_args="-S"
-    if [ "$command" = "pacman" ]; then
-      su_needed=true
-    fi
-    ;;
-  "update")
-    command_args="-Sy"
-    if [ "$command" = "pacman" ]; then
-      su_needed=true
-    fi
-    execute_command "${@}"
-
-    su_needed=false
-    command_args="-Qu"
-    echo
-    echo "$(execute_command "${@}" | wc -l) packages are available for update"
-    exit 0
-    ;;
-  "upgradable")
-    command_args="-Qu"
-    ;;
-  "upgrade")
-    command_args="-Syu"
-    if [ "$command" = "pacman" ]; then
-      su_needed=true
-    fi
-    ;;
-  "remove")
-    command_args="-Rs"
-    if [ "$command" = "pacman" ]; then
-      su_needed=true
-    fi
-    ;;
-  "purge")
-    command_args="-Rns"
-    if [ "$command" = "pacman" ]; then
-      su_needed=true
-    fi
-    ;;
-  "clean")
-    command_args="-Scc"
-    if [ "$command" = "pacman" ]; then
-      su_needed=true
-    fi
-    ;;
-  *)
-    if [ "$more_arguments" = "true" ]; then
-      echo "Invalid command: \"$command_args\""
-      echo
-      echo "Usage: pman <command> [args...]"
-      echo "Available commands:"
-      echo "  yay (aur)    - yay              | invoke yay "
-      echo "               (aur packages - all the normal operations except config are available)"
-      echo "  aur (yay)    - yay              | same as \"yay\""
-      echo "  search       - pacman -Ss       | search packages"
-      echo "  info         - pacman -Si       | show package information"
-      echo "  localinfo    - pacman -Qi       | show local package information"
-      echo "  provides     - pacman -F        | list packages that provide file"
-      echo "  providefiles - pacman -Fl       | list files provided by package"
-      echo "  installed    - pacman -Q        | list installed packages"
-      echo "  install      - pacman -S        | install packages"
-      echo "  update       - pacman -Sy       | updates the repositories"
-      echo "  upgradable   - pacman -Qu       | list available upgrades"
-      echo "  upgrade      - pacman -Syu      | upgrades your system"
-      echo "  remove       - pacman -Rs       | remove packages & dependencies"
-      echo "  purge        - pacman -Rns      | remove packages, dependencies & conf"
-      echo "  clean        - pacman -Scc      | remove all package files & trash"
-      echo "  reflector    - mirrorlist       | refresh the mirrorlist with reflector (if used)"
-      echo "               (do not use if file location differ from default /etc/pacman.d/mirrorlist)"
-      echo "  config       - /etc/pacman.conf | edits pacman configuration"
-      exit 1
-    fi
-    ;;
-esac
-
-execute_command "${@}"