749feb2720948a4ac9a981286654962e699d8d94

Author
Daniel Bolton <dbb@9y.com>
Committer
Daniel Bolton <dbb@9y.com>
Date

Message

Merge "deb" and "debian" plugins.

Diff

 1diff --git a/plugins/deb/deb.plugin.zsh b/plugins/deb/deb.plugin.zsh
 2deleted file mode 100644
 3index 1b35a064628625497cd67c2163c00d02a4c35cff..0000000000000000000000000000000000000000
 4--- a/plugins/deb/deb.plugin.zsh
 5+++ /dev/null
 6@@ -1,13 +0,0 @@
 7-# Aliases
 8-alias as="aptitude -F \"* %p -> %d \n(%v/%V)\" \
 9-		--no-gui --disable-columns search"	# search package
10-alias ad="sudo apt-get update"				# update packages lists
11-alias au="sudo apt-get update && \
12-		sudo apt-get dselect-upgrade"		# upgrade packages
13-alias ai="sudo apt-get install"				# install package
14-alias ar="sudo apt-get remove --purge && \
15-		sudo apt-get autoremove --purge"	# remove package
16-alias ap="apt-cache policy"				# apt policy
17-alias av="apt-cache show"				# show package info
18-alias acs="apt-cache search"                            # search package
19-alias ac="sudo apt-get clean && sudo apt-get autoclean" # clean apt cache
20diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
21index f8865a41210d3318525e867734cffd7cbe5bb7b2..6feb6973d92c68c19a3c45aaf687d5c1ee7cec8d 100644
22--- a/plugins/debian/debian.plugin.zsh
23+++ b/plugins/debian/debian.plugin.zsh
24@@ -1,4 +1,4 @@
25-# https://github.com/dbbolton/
26+# https://github.com/dbb/
27 #
28 # Debian-related zsh aliases and functions for zsh
29 
30@@ -6,14 +6,29 @@
31 # Aliases ###################################################################
32 
33 # Some self-explanatory aliases
34+alias acs="apt-cache search"
35 alias afs='apt-file search --regexp'
36 alias aps='aptitude search'
37+alias as="aptitude -F \"* %p -> %d \n(%v/%V)\" \
38+		--no-gui --disable-columns search"	# search package
39 alias apsrc='apt-get source'
40 alias apv='apt-cache policy'
41 
42+# aliases that use su -c ##############
43 alias apdg='su -c "aptitude update && aptitude safe-upgrade"'
44 alias apud='su -c "aptitude update"'
45 alias apug='su -c "aptitude safe-upgrade"'
46+# end aliases that use su -c ##########
47+
48+# aliases that use sudo ###############
49+alias ad="sudo apt-get update"				# update packages lists
50+alias au="sudo apt-get update && \
51+		sudo apt-get dselect-upgrade"		# upgrade packages
52+alias ai="sudo apt-get install"				# install package
53+alias ar="sudo apt-get remove --purge && \
54+		sudo apt-get autoremove --purge"	# remove package
55+alias ac="sudo apt-get clean && sudo apt-get autoclean" # clean apt cache
56+# end aliases that use sudo ###########
57 
58 # print all installed packages
59 alias allpkgs='aptitude search -F "%p" --disable-columns ~i'
60@@ -33,6 +48,13 @@ alias kclean='su -c '\''aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n`unam
61 
62 # Functions #################################################################
63 
64+# install packages without sudo
65+apin() {
66+    cmd="su -lc 'aptitude -P install $@' root"
67+    print "$cmd"
68+    eval "$cmd"
69+}
70+
71 # create a simple script that can be used to 'duplicate' a system
72 apt-copy() {
73 	print '#!/bin/sh'"\n" > apt-copy.sh
74@@ -46,8 +68,10 @@ apt-copy() {
75 
76 
77 # Kernel-package building shortcut
78-dbb-build () {
79-	MAKEFLAGS=''		# temporarily unset MAKEFLAGS ( '-j3' will fail )
80+kerndeb () {
81+    # temporarily unset MAKEFLAGS ( '-j3' will fail )
82+    MAKEFLAGS=$( print - $MAKEFLAGS | perl -pe 's/-j\s*[\d]+//g' )		
83+    print '$MAKEFLAGS set to '"'$MAKEFLAGS'"
84 	appendage='-custom' # this shows up in $ (uname -r )
85     revision=$(date +"%Y%m%d") # this shows up in the .deb file name
86