Merge pull request #5335 from mcornella/cleanup-archlinux-plugin

Clean up Archlinux plugin

plugins/archlinux/README.md

@@ -1,64 +1,69 @@
-## ARCHLINUX PLUGIN
+# Archlinux plugin
 
+## Features
 
----
+#### YAOURT
+
+| Alias   | Command                            | Description                                                         |
+|---------|------------------------------------|---------------------------------------------------------------------|
+| yaconf  | yaourt -C                          | Fix all configuration files with vimdiff                            |
+| yain    | yaourt -S                          | Install packages from the repositories                              |
+| yains   | yaourt -U                          | Install a package from a local file                                 |
+| yainsd  | yaourt -S --asdeps                 | Install packages as dependencies of another package                 |
+| yaloc   | yaourt -Qi                         | Display information about a package in the local database           |
+| yalocs  | yaourt -Qs                         | Search for packages in the local database                           |
+| yalst   | yaourt -Qe                         | List installed packages including from AUR (tagged as "local")      |
+| yamir   | yaourt -Syy                        | Force refresh of all package lists after updating mirrorlist        |
+| yaorph  | yaourt -Qtd                        | Remove orphans using yaourt                                         |
+| yare    | yaourt -R                          | Remove packages, keeping its settings and dependencies              |
+| yarem   | yaourt -Rns                        | Remove packages, including its settings and unneeded dependencies   |
+| yarep   | yaourt -Si                         | Display information about a package in the repositories             |
+| yareps  | yaourt -Ss                         | Search for packages in the repositories                             |
+| yaupd   | yaourt -Sy && sudo abs && sudo aur | Update and refresh local package, ABS and AUR databases             |
+| yaupd   | yaourt -Sy && sudo abs             | Update and refresh the local package and ABS databases              |
+| yaupd   | yaourt -Sy && sudo aur             | Update and refresh the local package and AUR databases              |
+| yaupd   | yaourt -Sy                         | Update and refresh the local package database                       |
+| yaupg   | yaourt -Syua                       | Sync with repositories before upgrading all packages (from AUR too) |
+| yasu    | yaourt -Syua --no-confirm          | Same as `yaupg`, but without confirmation                           |
+| upgrade | yaourt -Syu                        | Sync with repositories before upgrading packages                    |
 
-### FEATURES
+#### PACMAN
 
-| Alias        | Function                                | Description                                                                                                         |
-|:------------:|-----------------------------------------|:--------------------------------------------------------------------------------------------------------------------|
-| pacin        | sudo pacman -S                          | Install specific package(s) from the repositories                                                                   |
-| pacins       | sudo pacman -U                          | Install specific package not from the repositories but from a file                                                  |
-| pacinsd      | sudo pacman -S --asdeps                 | Install given package(s) as dependencies of another package                                                         |
-| pacloc       | pacman -Qi                              | Display information about a given package in the local database                                                     |
-| paclocs      | pacman -Qs                              | Search for package(s) in the local database                                                                         |
-| paclsorphans | sudo pacman -Qdt'                       | List all orphaned packages                                                                                          |
-| pacmir       | sudo pacman -Syy                        | Force refresh of all package lists after updating /etc/pacman.d/mirrorlist                                          |
-| pacre        | sudo pacman -R                          | Remove the specified package(s), retaining its configuration(s) and required dependencies                           |
-| pacrem       | sudo pacman -Rns                        | Remove the specified package(s), its configuration(s) and unneeded dependencies                                     |
-| pacrep       | pacman -Si                              | Display information about a given package in the repositories                                                       |
-| pacreps      | pacman -Ss                              | Search for package(s) in the repositories                                                                           |
-| pacrmorphans | sudo pacman -Rs $(pacman -Qtdq)'        | Delete all orphaned packages                                                                                        |
-| pacupd       | sudo pacman -Sy && sudo abs && sudo aur | Update and refresh the local package, ABS and AUR databases against repositories                                    |
-| pacupd       | sudo pacman -Sy && sudo abs             | Update and refresh the local package and ABS databases against repositories                                         |
-| pacupd       | sudo pacman -Sy && sudo aur             | Update and refresh the local package and AUR databases against repositories                                         |
-| pacupd       | sudo pacman -Sy                         | Update and refresh the local package database against repositories                                                  |
-| pacupg       | sudo pacman -Syu                        | Synchronize with repositories before upgrading packages that are out of date on the local system.                   |
-| yaconf       | yaourt -C                               | Fix all configuration files with vimdiff                                                                            |
-| yain         | yaourt -S                               | Install specific package(s) from the repositories                                                                   |
-| yains        | yaourt -U                               | Install specific package not from the repositories but from a file                                                  |
-| yainsd       | yaourt -S --asdeps                      | Install given package(s) as dependencies of another package                                                         |
-| yaloc        | yaourt -Qi                              | Display information about a given package in the local database                                                     |
-| yalocs       | yaourt -Qs                              | Search for package(s) in the local database                                                                         |
-| yalst        | yaourt -Qe                              | List installed packages, even those installed from AUR (they're tagged as "local")                                  |
-| yamir        | yaourt -Syy                             | Force refresh of all package lists after updating /etc/pacman.d/mirrorlist                                          |
-| yaorph       | yaourt -Qtd                             | Remove orphans using yaourt                                                                                         |
-| yare         | yaourt -R                               | Remove the specified package(s), retaining its configuration(s) and required dependencies                           |
-| yarem        | yaourt -Rns                             | Remove the specified package(s), its configuration(s) and unneeded dependencies                                     |
-| yarep        | yaourt -Si                              | Display information about a given package in the repositories                                                       |
-| yareps       | yaourt -Ss                              | Search for package(s) in the repositories                                                                           |
-| yasu         | yaourt -Syua --no-confirm               | Same as yaupg, but without confirmation                                                                             |
-| yaupd        | yaourt -Sy && sudo abs && sudo aur      | Update and refresh the local package, ABS and AUR databases against repositories                                    |
-| yaupd        | yaourt -Sy && sudo abs                  | Update and refresh the local package and ABS databases against repositories                                         |
-| yaupd        | yaourt -Sy && sudo aur                  | Update and refresh the local package and AUR databases against repositories                                         |
-| yaupd        | yaourt -Sy                              | Update and refresh the local package database against repositories                                                  |
-| yaupg        | yaourt -Syua                            | Synchronize with repositories before upgrading packages (AUR packages too) that are out of date on the local system |
+| Alias        | Command                                 | Description                                                  |
+|--------------|-----------------------------------------|--------------------------------------------------------------|
+| pacin        | sudo pacman -S                          | Install packages from the repositories                       |
+| pacins       | sudo pacman -U                          | Install a package from a local file                          |
+| pacinsd      | sudo pacman -S --asdeps                 | Install packages as dependencies of another package          |
+| pacloc       | pacman -Qi                              | Display information about a package in the local database    |
+| paclocs      | pacman -Qs                              | Search for packages in the local database                    |
+| paclsorphans | sudo pacman -Qdt                        | List all orphaned packages                                   |
+| pacmir       | sudo pacman -Syy                        | Force refresh of all package lists after updating mirrorlist |
+| pacre        | sudo pacman -R                          | Remove packages, keeping its settings and dependencies       |
+| pacrem       | sudo pacman -Rns                        | Remove packages, including its settings and dependencies     |
+| pacrep       | pacman -Si                              | Display information about a package in the repositories      |
+| pacreps      | pacman -Ss                              | Search for packages in the repositories                      |
+| pacrmorphans | sudo pacman -Rs $(pacman -Qtdq)         | Delete all orphaned packages                                 |
+| pacupd       | sudo pacman -Sy && sudo abs && sudo aur | Update and refresh the local package, ABS and AUR databases  |
+| pacupd       | sudo pacman -Sy && sudo abs             | Update and refresh the local package and ABS databases       |
+| pacupd       | sudo pacman -Sy && sudo aur             | Update and refresh the local package and AUR databases       |
+| pacupd       | sudo pacman -Sy                         | Update and refresh the local package database                |
+| pacupg       | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
+| upgrade      | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
 
-| Function       | Description                                                                                                       |
-|----------------|:------------------------------------------------------------------------------------------------------------------|
-| pacdisowned    | List all disowned files in your system                                                                            |
-| paclist        | List all installed packages with a short description - [Source](https://bbs.archlinux.org/viewtopic.php?id=93683) |
-| pacmanallkeys  | Get all keys for developers and trusted users                                                                     |
-| pacmansignkeys |                                                                                                                   |
+| Function       | Description                                          |
+|----------------|------------------------------------------------------|
+| pacdisowned    | List all disowned files in your system               |
+| paclist        | List all installed packages with a short description |
+| pacmanallkeys  | Get all keys for developers and trusted users        |
+| pacmansignkeys | Locally trust all keys passed as parameters          |
 
 ---
 
-### CONTRIBUTORS
- - Benjamin Boudreau - dreurmail@gmail.com
- - Celso Miranda - contacto@celsomiranda.net
- - KhasMek - Boushh@gmail.com
- - Martin Putniorz - mputniorz@gmail.com
- - MatthR3D - matthr3d@gmail.com
- - ornicar - thibault.duplessis@gmail.com
+## Contributors
 
----
+- Benjamin Boudreau - dreurmail@gmail.com
+- Celso Miranda - contacto@celsomiranda.net
+- KhasMek - Boushh@gmail.com
+- Martin Putniorz - mputniorz@gmail.com
+- MatthR3D - matthr3d@gmail.com
+- ornicar - thibault.duplessis@gmail.com

plugins/archlinux/archlinux.plugin.zsh

@@ -1,75 +1,75 @@
-# Archlinux zsh aliases and functions
-# Usage is also described at https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins
-
-# Look for yaourt, and add some useful functions if we have it.
-if (( $+commands[yaourt] )); then
+if ! (( $+commands[yaourt] )); then
+  upgrade() {
+    sudo pacman -Syu
+  }
+else
   upgrade () {
     yaourt -Syu
   }
-  alias yaconf='yaourt -C'        # Fix all configuration files with vimdiff
-  # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
-  alias yaupg='yaourt -Syua'        # Synchronize with repositories before upgrading packages (AUR packages too) that are out of date on the local system.
-  alias yasu='yaourt --Syua --no-confirm' # Same as yaupg, but without confirmation
-  alias yain='yaourt -S'           # Install specific package(s) from the repositories
-  alias yains='yaourt -U'          # Install specific package not from the repositories but from a file
-  alias yare='yaourt -R'           # Remove the specified package(s), retaining its configuration(s) and required dependencies
-  alias yarem='yaourt -Rns'        # Remove the specified package(s), its configuration(s) and unneeded dependencies
-  alias yarep='yaourt -Si'         # Display information about a given package in the repositories
-  alias yareps='yaourt -Ss'        # Search for package(s) in the repositories
-  alias yaloc='yaourt -Qi'         # Display information about a given package in the local database
-  alias yalocs='yaourt -Qs'        # Search for package(s) in the local database
-  alias yalst='yaourt -Qe'         # List installed packages, even those installed from AUR (they're tagged as "local")
-  alias yaorph='yaourt -Qtd'       # Remove orphans using yaourt
-  # Additional yaourt alias examples
+
+  alias yaconf='yaourt -C'
+  alias yaupg='yaourt -Syua'
+  alias yasu='yaourt --Syua --no-confirm'
+  alias yain='yaourt -S'
+  alias yains='yaourt -U'
+  alias yare='yaourt -R'
+  alias yarem='yaourt -Rns'
+  alias yarep='yaourt -Si'
+  alias yareps='yaourt -Ss'
+  alias yaloc='yaourt -Qi'
+  alias yalocs='yaourt -Qs'
+  alias yalst='yaourt -Qe'
+  alias yaorph='yaourt -Qtd'
+  alias yainsd='yaourt -S --asdeps'
+  alias yamir='yaourt -Syy'
+
+
   if (( $+commands[abs] && $+commands[aur] )); then
-    alias yaupd='yaourt -Sy && sudo abs && sudo aur'  # Update and refresh the local package, ABS and AUR databases against repositories
+    alias yaupd='yaourt -Sy && sudo abs && sudo aur'
   elif (( $+commands[abs] )); then
-    alias yaupd='yaourt -Sy && sudo abs'   # Update and refresh the local package and ABS databases against repositories
+    alias yaupd='yaourt -Sy && sudo abs'
   elif (( $+commands[aur] )); then
-    alias yaupd='yaourt -Sy && sudo aur'   # Update and refresh the local package and AUR databases against repositories
+    alias yaupd='yaourt -Sy && sudo aur'
   else
-    alias yaupd='yaourt -Sy'               # Update and refresh the local package database against repositories
+    alias yaupd='yaourt -Sy'
   fi
-  alias yainsd='yaourt -S --asdeps'        # Install given package(s) as dependencies of another package
-  alias yamir='yaourt -Syy'                # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist
-else
- upgrade() {
-   sudo pacman -Syu
- }
 fi
 
 # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
-alias pacupg='sudo pacman -Syu'        # Synchronize with repositories before upgrading packages that are out of date on the local system.
-alias pacin='sudo pacman -S'           # Install specific package(s) from the repositories
-alias pacins='sudo pacman -U'          # Install specific package not from the repositories but from a file
-alias pacre='sudo pacman -R'           # Remove the specified package(s), retaining its configuration(s) and required dependencies
-alias pacrem='sudo pacman -Rns'        # Remove the specified package(s), its configuration(s) and unneeded dependencies
-alias pacrep='pacman -Si'              # Display information about a given package in the repositories
-alias pacreps='pacman -Ss'             # Search for package(s) in the repositories
-alias pacloc='pacman -Qi'              # Display information about a given package in the local database
-alias paclocs='pacman -Qs'             # Search for package(s) in the local database
-# Additional pacman alias examples
+alias pacupg='sudo pacman -Syu'
+alias pacin='sudo pacman -S'
+alias pacins='sudo pacman -U'
+alias pacre='sudo pacman -R'
+alias pacrem='sudo pacman -Rns'
+alias pacrep='pacman -Si'
+alias pacreps='pacman -Ss'
+alias pacloc='pacman -Qi'
+alias paclocs='pacman -Qs'
+alias pacinsd='sudo pacman -S --asdeps'
+alias pacmir='sudo pacman -Syy'
+alias paclsorphans='sudo pacman -Qdt'
+alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
+
+
 if (( $+commands[abs] && $+commands[aur] )); then
-  alias pacupd='sudo pacman -Sy && sudo abs && sudo aur'  # Update and refresh the local package, ABS and AUR databases against repositories
+  alias pacupd='sudo pacman -Sy && sudo abs && sudo aur'
 elif (( $+commands[abs] )); then
-  alias pacupd='sudo pacman -Sy && sudo abs'              # Update and refresh the local package and ABS databases against repositories
+  alias pacupd='sudo pacman -Sy && sudo abs'
 elif (( $+commands[aur] )); then
-  alias pacupd='sudo pacman -Sy && sudo aur'              # Update and refresh the local package and AUR databases against repositories
+  alias pacupd='sudo pacman -Sy && sudo aur'
 else
-  alias pacupd='sudo pacman -Sy'     # Update and refresh the local package database against repositories
+  alias pacupd='sudo pacman -Sy'
 fi
-alias pacinsd='sudo pacman -S --asdeps'        # Install given package(s) as dependencies of another package
-alias pacmir='sudo pacman -Syy'                # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist
 
-# https://bbs.archlinux.org/viewtopic.php?id=93683
 paclist() {
-  LC_ALL=C pacman -Qei $(pacman -Qu|cut -d" " -f 1)|awk ' BEGIN {FS=":"}/^Name/{printf("\033[1;36m%s\033[1;37m", $2)}/^Description/{print $2}'
+  # Source: https://bbs.archlinux.org/viewtopic.php?id=93683
+  LC_ALL=C pacman -Qei $(pacman -Qu | cut -d " " -f 1) | \
+    awk 'BEGIN {FS=":"} /^Name/{printf("\033[1;36m%s\033[1;37m", $2)} /^Description/{print $2}'
 }
 
-alias paclsorphans='sudo pacman -Qdt'
-alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
-
 pacdisowned() {
+  emulate -L zsh
+
   tmp=${TMPDIR-/tmp}/pacman-disowned-$UID-$$
   db=$tmp/db
   fs=$tmp/fs
@@ -79,21 +79,21 @@ pacdisowned() {
 
   pacman -Qlq | sort -u > "$db"
 
-  find /bin /etc /lib /sbin /usr \
-      ! -name lost+found \
-        \( -type d -printf '%p/\n' -o -print \) | sort > "$fs"
+  find /bin /etc /lib /sbin /usr ! -name lost+found \
+    \( -type d -printf '%p/\n' -o -print \) | sort > "$fs"
 
   comm -23 "$fs" "$db"
 }
 
 pacmanallkeys() {
-  # Get all keys for developers and trusted users
-  curl https://www.archlinux.org/{developers,trustedusers}/ |
-  awk -F\" '(/pgp.mit.edu/) {sub(/.*search=0x/,"");print $1}' |
-  xargs sudo pacman-key --recv-keys
+  emulate -L zsh
+  curl -s https://www.archlinux.org/people/{developers,trustedusers}/ | \
+    awk -F\" '(/pgp.mit.edu/) { sub(/.*search=0x/,""); print $1}' | \
+    xargs sudo pacman-key --recv-keys
 }
 
 pacmansignkeys() {
+  emulate -L zsh
   for key in $*; do
     sudo pacman-key --recv-keys $key
     sudo pacman-key --lsign-key $key