b18e5bf49c064230d106a597ab075a054f0beec9

Author
Marc Cornellà <marc.cornella@live.com>
Committer
Marc Cornellà <marc.cornella@live.com>
Date

Message

Merge branch 'Majora320-master'

Closes #5460

Diff

  1diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
  2index 785538a564e9a7eab20f391eb49741d51a48ad7d..73a5037b0accb97cfbc224329db59f5b8b5aa301 100644
  3--- a/plugins/archlinux/README.md
  4+++ b/plugins/archlinux/README.md
  5@@ -27,6 +27,30 @@
  6 | yasu    | yaourt -Syua --no-confirm          | Same as `yaupg`, but without confirmation                           |
  7 | upgrade | yaourt -Syu                        | Sync with repositories before upgrading packages                    |
  8 
  9+### PACAUR
 10+
 11+| Alias   | Command                            | Description                                                         |
 12+|---------|------------------------------------|---------------------------------------------------------------------|
 13+| pain    | pacaur -S                          | Install packages from the repositories                              |
 14+| pains   | pacaur -U                          | Install a package from a local file                                 |
 15+| painsd  | pacaur -S --asdeps                 | Install packages as dependencies of another package                 |
 16+| paloc   | pacaur -Qi                         | Display information about a package in the local database           |
 17+| palocs  | pacaur -Qs                         | Search for packages in the local database                           |
 18+| palst   | pacaur -Qe                         | List installed packages including from AUR (tagged as "local")      |
 19+| pamir   | pacaur -Syy                        | Force refresh of all package lists after updating mirrorlist        |
 20+| paorph  | pacaur -Qtd                        | Remove orphans using pacaur                                         |
 21+| pare    | pacaur -R                          | Remove packages, keeping its settings and dependencies              |
 22+| parem   | pacaur -Rns                        | Remove packages, including its settings and unneeded dependencies   |
 23+| parep   | pacaur -Si                         | Display information about a package in the repositories             |
 24+| pareps  | pacaur -Ss                         | Search for packages in the repositories                             |
 25+| paupd   | pacaur -Sy && sudo abs && sudo aur | Update and refresh local package, ABS and AUR databases             |
 26+| paupd   | pacaur -Sy && sudo abs             | Update and refresh the local package and ABS databases              |
 27+| paupd   | pacaur -Sy && sudo aur             | Update and refresh the local package and AUR databases              |
 28+| paupd   | pacaur -Sy                         | Update and refresh the local package database                       |
 29+| paupg   | pacaur -Syua                       | Sync with repositories before upgrading all packages (from AUR too) |
 30+| pasu    | pacaur -Syua --no-confirm          | Same as `paupg`, but without confirmation                           |
 31+| upgrade | pacaur -Syu
 32+
 33 #### PACMAN
 34 
 35 | Alias        | Command                                 | Description                                                  |
 36@@ -67,3 +91,5 @@
 37 - Martin Putniorz - mputniorz@gmail.com
 38 - MatthR3D - matthr3d@gmail.com
 39 - ornicar - thibault.duplessis@gmail.com
 40+- Juraj Fiala - doctorjellyface@riseup.net
 41+- Majora320 (Moses Miller) - Majora320@gmail.com
 42diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
 43index 1637e8561d9a803503dc60265dce6711698f24f4..3156e949a80275931d09623faba734435d32986d 100644
 44--- a/plugins/archlinux/archlinux.plugin.zsh
 45+++ b/plugins/archlinux/archlinux.plugin.zsh
 46@@ -1,12 +1,4 @@
 47-if ! (( $+commands[yaourt] )); then
 48-  upgrade() {
 49-    sudo pacman -Syu
 50-  }
 51-else
 52-  upgrade () {
 53-    yaourt -Syu
 54-  }
 55-
 56+if (( $+commands[yaourt] )); then
 57   alias yaconf='yaourt -C'
 58   alias yaupg='yaourt -Syua'
 59   alias yasu='yaourt -Syua --noconfirm'
 60@@ -35,6 +27,47 @@ else
 61   fi
 62 fi
 63 
 64+if (( $+commands[pacaur] )); then
 65+  alias paupg='pacaur -Syua'
 66+  alias pasu='pacaur -Syua --noconfirm'
 67+  alias pain='pacaur -S'
 68+  alias pains='pacaur -U'
 69+  alias pare='pacaur -R'
 70+  alias parem='pacaur -Rns'
 71+  alias parep='pacaur -Si'
 72+  alias pareps='pacaur -Ss'
 73+  alias paloc='pacaur -Qi'
 74+  alias palocs='pacaur -Qs'
 75+  alias palst='pacaur -Qe'
 76+  alias paorph='pacaur -Qtd'
 77+  alias painsd='pacaur -S --asdeps'
 78+  alias pamir='pacaur -Syy'
 79+
 80+  if (( $+commands[abs] && $+commands[aur] )); then
 81+    alias paupd='pacaur -Sy && sudo abs && sudo aur'
 82+  elif (( $+commands[abs] )); then
 83+    alias paupd='pacaur -Sy && sudo abs'
 84+  elif (( $+commands[aur] )); then
 85+    alias paupd='pacaur -Sy && sudo aur'
 86+  else
 87+    alias paupd='pacaur -Sy'
 88+  fi
 89+fi
 90+
 91+if (( $+commands[pacaur] )); then
 92+  upgrade() {
 93+    pacaur -Syu
 94+  }
 95+elif (( $+commands[yaourt] )); then
 96+  upgrade() {
 97+    yaourt -Syu
 98+  }
 99+else
100+  upgrade() {
101+    sudo pacman -Syu
102+  }
103+fi
104+
105 # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
106 alias pacupg='sudo pacman -Syu'
107 alias pacin='sudo pacman -S'