summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorMarc Cornellà <marc.cornella@live.com>2019-09-08 14:59:50 +0200
committerGitHub <noreply@github.com>2019-09-08 14:59:50 +0200
commit2b4d72322b163c41d4def4dc370044a186067ec0 (patch)
tree5c6ad45f0b5bd6d91fc9f9a16691c53c9bf1ba3f /plugins
parenta4f6a9964ceec3d222a8caa8eb3e5cf6027cfbab (diff)
parenta870fee6a7cb6783e85abe42a222c7d5f4e89676 (diff)
downloadzsh-2b4d72322b163c41d4def4dc370044a186067ec0.tar.gz
zsh-2b4d72322b163c41d4def4dc370044a186067ec0.tar.bz2
zsh-2b4d72322b163c41d4def4dc370044a186067ec0.zip
debian: fix bad function definitions (#8129)
* Fix bad function definitions in Debian plugin There appears to be a definition issue for some functions/aliases which result in the following errors when sourcing .zshrc: ``` /home/username/.oh-my-zsh/plugins/debian/debian.plugin.zsh:75: defining function based on alias `abd' /home/username/.oh-my-zsh/plugins/debian/debian.plugin.zsh:75: parse error near `()' ``` Fixes #7986 * Update syntax on the remaining functions
Diffstat (limited to 'plugins')
-rw-r--r--plugins/debian/debian.plugin.zsh19
1 files changed, 9 insertions, 10 deletions
diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index be4062ebf..68c6df1ae 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -72,7 +72,7 @@ if [[ $use_sudo -eq 1 ]]; then
# commands using su #########
else
alias aac="su -ls '$apt_pref autoclean' root"
- abd() {
+ function abd() {
cmd="su -lc '$apt_pref build-dep $@' root"
print "$cmd"
eval "$cmd"
@@ -83,17 +83,17 @@ else
alias adu="su -lc '$apt_pref update && aptitude dist-upgrade' root"
alias afu="su -lc '$apt-file update'"
alias au="su -lc '$apt_pref $apt_upgr' root"
- ai() {
+ function ai() {
cmd="su -lc 'aptitude -P install $@' root"
print "$cmd"
eval "$cmd"
}
- ap() {
+ function ap() {
cmd="su -lc '$apt_pref -P purge $@' root"
print "$cmd"
eval "$cmd"
}
- ar() {
+ function ar() {
cmd="su -lc '$apt_pref -P remove $@' root"
print "$cmd"
eval "$cmd"
@@ -114,7 +114,7 @@ fi
# Registers a compdef for $1 that calls $apt_pref with the commands $2
# To do that it creates a new completion function called _apt_pref_$2
#
-apt_pref_compdef() {
+function apt_pref_compdef() {
local f fb
f="_apt_pref_${2}"
@@ -151,7 +151,7 @@ alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
# Functions #################################################################
# create a simple script that can be used to 'duplicate' a system
-apt-copy() {
+function apt-copy() {
print '#!/bin/sh'"\n" > apt-copy.sh
cmd='$apt_pref install'
@@ -173,7 +173,7 @@ apt-copy() {
# apt-history rollback
# apt-history list
# Based On: https://linuxcommando.blogspot.com/2008/08/how-to-show-apt-log-history.html
-apt-history () {
+function apt-history() {
case "$1" in
install)
zgrep --no-filename 'install ' $(ls -rt /var/log/dpkg*)
@@ -202,7 +202,7 @@ apt-history () {
}
# Kernel-package building shortcut
-kerndeb () {
+function kerndeb() {
# temporarily unset MAKEFLAGS ( '-j3' will fail )
MAKEFLAGS=$( print - $MAKEFLAGS | perl -pe 's/-j\s*[\d]+//g' )
print '$MAKEFLAGS set to '"'$MAKEFLAGS'"
@@ -216,10 +216,9 @@ kerndeb () {
}
# List packages by size
-function apt-list-packages {
+function apt-list-packages() {
dpkg-query -W --showformat='${Installed-Size} ${Package} ${Status}\n' | \
grep -v deinstall | \
sort -n | \
awk '{print $1" "$2}'
}
-