Merge branch 'Majora320-master'

Closes #5460
ohmyzsh · Oct 2, 2016 · b18e5bf · b18e5bf
2 parents d186bc3 + e418a2b
commit b18e5bf
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 9 deletions.
diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
@@ -27,6 +27,30 @@
 | yasu    | yaourt -Syua --no-confirm          | Same as `yaupg`, but without confirmation                           |
 | upgrade | yaourt -Syu                        | Sync with repositories before upgrading packages                    |
 
+### PACAUR
+
+| Alias   | Command                            | Description                                                         |
+|---------|------------------------------------|---------------------------------------------------------------------|
+| pain    | pacaur -S                          | Install packages from the repositories                              |
+| pains   | pacaur -U                          | Install a package from a local file                                 |
+| painsd  | pacaur -S --asdeps                 | Install packages as dependencies of another package                 |
+| paloc   | pacaur -Qi                         | Display information about a package in the local database           |
+| palocs  | pacaur -Qs                         | Search for packages in the local database                           |
+| palst   | pacaur -Qe                         | List installed packages including from AUR (tagged as "local")      |
+| pamir   | pacaur -Syy                        | Force refresh of all package lists after updating mirrorlist        |
+| paorph  | pacaur -Qtd                        | Remove orphans using pacaur                                         |
+| pare    | pacaur -R                          | Remove packages, keeping its settings and dependencies              |
+| parem   | pacaur -Rns                        | Remove packages, including its settings and unneeded dependencies   |
+| parep   | pacaur -Si                         | Display information about a package in the repositories             |
+| pareps  | pacaur -Ss                         | Search for packages in the repositories                             |
+| paupd   | pacaur -Sy && sudo abs && sudo aur | Update and refresh local package, ABS and AUR databases             |
+| paupd   | pacaur -Sy && sudo abs             | Update and refresh the local package and ABS databases              |
+| paupd   | pacaur -Sy && sudo aur             | Update and refresh the local package and AUR databases              |
+| paupd   | pacaur -Sy                         | Update and refresh the local package database                       |
+| paupg   | pacaur -Syua                       | Sync with repositories before upgrading all packages (from AUR too) |
+| pasu    | pacaur -Syua --no-confirm          | Same as `paupg`, but without confirmation                           |
+| upgrade | pacaur -Syu
+
 #### PACMAN
 
 | Alias        | Command                                 | Description                                                  |
@@ -67,3 +91,5 @@
 - Martin Putniorz - mputniorz@gmail.com
 - MatthR3D - matthr3d@gmail.com
 - ornicar - thibault.duplessis@gmail.com
+- Juraj Fiala - doctorjellyface@riseup.net
+- Majora320 (Moses Miller) - Majora320@gmail.com
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
@@ -1,12 +1,4 @@
-if ! (( $+commands[yaourt] )); then
-  upgrade() {
-    sudo pacman -Syu
-  }
-else
-  upgrade () {
-    yaourt -Syu
-  }
-
+if (( $+commands[yaourt] )); then
   alias yaconf='yaourt -C'
   alias yaupg='yaourt -Syua'
   alias yasu='yaourt -Syua --noconfirm'
@@ -35,6 +27,47 @@ else
   fi
 fi
 
+if (( $+commands[pacaur] )); then
+  alias paupg='pacaur -Syua'
+  alias pasu='pacaur -Syua --noconfirm'
+  alias pain='pacaur -S'
+  alias pains='pacaur -U'
+  alias pare='pacaur -R'
+  alias parem='pacaur -Rns'
+  alias parep='pacaur -Si'
+  alias pareps='pacaur -Ss'
+  alias paloc='pacaur -Qi'
+  alias palocs='pacaur -Qs'
+  alias palst='pacaur -Qe'
+  alias paorph='pacaur -Qtd'
+  alias painsd='pacaur -S --asdeps'
+  alias pamir='pacaur -Syy'
+
+  if (( $+commands[abs] && $+commands[aur] )); then
+    alias paupd='pacaur -Sy && sudo abs && sudo aur'
+  elif (( $+commands[abs] )); then
+    alias paupd='pacaur -Sy && sudo abs'
+  elif (( $+commands[aur] )); then
+    alias paupd='pacaur -Sy && sudo aur'
+  else
+    alias paupd='pacaur -Sy'
+  fi
+fi
+
+if (( $+commands[pacaur] )); then
+  upgrade() {
+    pacaur -Syu
+  }
+elif (( $+commands[yaourt] )); then
+  upgrade() {
+    yaourt -Syu
+  }
+else
+  upgrade() {
+    sudo pacman -Syu
+  }
+fi
+
 # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
 alias pacupg='sudo pacman -Syu'
 alias pacin='sudo pacman -S'