From 65f16fb64b77754386f34d207e073ee457afb0e7 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 24 Aug 2016 08:08:55 +0200
Subject: archlinux: remove comments, format functions better
---
plugins/archlinux/archlinux.plugin.zsh | 112 ++++++++++++++++-----------------
1 file changed, 54 insertions(+), 58 deletions(-)
(limited to 'plugins')
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index f68443285..ef862f14c 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -1,74 +1,72 @@
-# 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() {
tmp=${TMPDIR-/tmp}/pacman-disowned-$UID-$$
db=$tmp/db
@@ -79,18 +77,16 @@ 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
+ curl https://www.archlinux.org/{developers,trustedusers}/ | \
+ awk -F\" '(/pgp.mit.edu/) { sub(/.*search=0x/,""); print $1}' | \
+ xargs sudo pacman-key --recv-keys
}
pacmansignkeys() {
--
cgit v1.2.3-70-g09d2