summaryrefslogtreecommitdiff
path: root/bash-completion
diff options
context:
space:
mode:
authorIgor Pashev <igor.pashev@nexenta.com>2013-04-08 13:25:16 +0400
committerIgor Pashev <igor.pashev@nexenta.com>2013-04-08 13:25:16 +0400
commit1fca2856b3366a47472df4cae78f77794cf1ce71 (patch)
treee4f9bb0d8501d337c1aa97e77e5f3812fd562f94 /bash-completion
parenta953cf98ab91bd09e233a2d749811b16c9465018 (diff)
downloadcibs-pkgs-1fca2856b3366a47472df4cae78f77794cf1ce71.tar.gz
Fix dynamic loading
Diffstat (limited to 'bash-completion')
-rw-r--r--bash-completion/Makefile1
-rw-r--r--bash-completion/addons/svcadm (renamed from bash-completion/addons/smf)9
-rw-r--r--bash-completion/addons/zfs (renamed from bash-completion/addons/zfsutils)0
-rw-r--r--bash-completion/bash-completion.p5m10
4 files changed, 12 insertions, 8 deletions
diff --git a/bash-completion/Makefile b/bash-completion/Makefile
index 00e9b31..afd2be1 100644
--- a/bash-completion/Makefile
+++ b/bash-completion/Makefile
@@ -1,6 +1,5 @@
package ?= ips
include /usr/share/cibs/rules/$(package).mk
-include /usr/share/cibs/rules/git.mk
include /usr/share/cibs/rules/autotools.mk
include /usr/share/cibs/rules/archive.mk
include /usr/share/cibs/rules/noarch.mk
diff --git a/bash-completion/addons/smf b/bash-completion/addons/svcadm
index 57ce673..e2a7c35 100644
--- a/bash-completion/addons/smf
+++ b/bash-completion/addons/svcadm
@@ -1,6 +1,7 @@
# svcadm completion -*- shell-script -*-
#
# Copyright 2006 Yann Rouillard <yann@opencsw.org>
+# Portions copyright 2013, Nexenta Systems, Inc.
#
# svcadm accept any complete FMRI or abreviated FMRI
@@ -137,9 +138,7 @@ _svcadm ()
fi
fi
fi
-} &&
-complete -F _svcadm svcadm
-
+}
_svcs () {
local cur prev opts line
@@ -167,7 +166,9 @@ _svcs () {
_smf_complete_fmri "${cur}" "svc:"
fi
-} &&
+}
+
+complete -F _svcadm svcadm
complete -F _svcs svcs
diff --git a/bash-completion/addons/zfsutils b/bash-completion/addons/zfs
index f59d73a..f59d73a 100644
--- a/bash-completion/addons/zfsutils
+++ b/bash-completion/addons/zfs
diff --git a/bash-completion/bash-completion.p5m b/bash-completion/bash-completion.p5m
index ccf9caa..4d2334c 100644
--- a/bash-completion/bash-completion.p5m
+++ b/bash-completion/bash-completion.p5m
@@ -2,7 +2,7 @@ set name=pkg.fmri value=pkg:/shell/bash-completion@$(ips-version)
set name=pkg.summary value="$(summary)"
set name=info.upstream-url value="$(home)"
set name=info.source-url value="$(download)"
-license $(license-file) license="$(license)"
+license $(license-file) license="$(license)"
dir path=usr/share/bash-completion
dir path=usr/share/bash-completion/completions
@@ -12,8 +12,12 @@ file path=etc/profile.d/bash_completion.sh
file addons/beadm path=usr/share/bash-completion/completions/beadm
file addons/bootadm path=usr/share/bash-completion/completions/bootadm
-file addons/smf path=usr/share/bash-completion/completions/smf
-file addons/zfsutils path=usr/share/bash-completion/completions/zfsutils
+
+file addons/zfs path=usr/share/bash-completion/completions/zfs
+link target=zfs path=usr/share/bash-completion/completions/zpool
+
+file addons/svcadm path=usr/share/bash-completion/completions/svcadm
+link target=svcadm path=usr/share/bash-completion/completions/svcs
file path=usr/share/bash-completion/bash_completion
file path=usr/share/bash-completion/completions/kldunload