New commits:
commit 4c62d4f5a337b2486fa93c1482339f85dfed7ca8
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
bash-completion: Updated and cleaned up smgl_completion. Bug #15174.
PATCHLEVEL++
diff --git a/shell-term-fm/bash-completion/DETAILS
b/shell-term-fm/bash-completion/DETAILS
index fe9d002..b8ebf77 100755
--- a/shell-term-fm/bash-completion/DETAILS
+++ b/shell-term-fm/bash-completion/DETAILS
@@ -6,7 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/bash_completion
SOURCE_URL[0]=http://www.caliban.org/files/bash/$SOURCE
WEB_SITE=http://www.caliban.org/bash/index.shtml#completion
ENTERED=20020215
- PATCHLEVEL=5
+ PATCHLEVEL=6
LICENSE[0]=GPL
KEYWORDS="bash console"
SHORT="bash programmable completion"
diff --git a/shell-term-fm/bash-completion/HISTORY
b/shell-term-fm/bash-completion/HISTORY
index e94d8e0..173a7bc 100644
--- a/shell-term-fm/bash-completion/HISTORY
+++ b/shell-term-fm/bash-completion/HISTORY
@@ -1,3 +1,7 @@
+2009-04-20 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * smgl_completion: Updated and cleaned up. Bug 15174
+
2009-03-16 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* start_completion: Updated to work with bash 4.0
diff --git a/shell-term-fm/bash-completion/smgl_completion
b/shell-term-fm/bash-completion/smgl_completion
index cc80c6d..2a3559a 100644
--- a/shell-term-fm/bash-completion/smgl_completion
+++ b/shell-term-fm/bash-completion/smgl_completion
@@ -28,6 +28,22 @@ _dashify()
done
}
+_dashify1()
+{
+ local i
+ for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
+ COMPREPLY[i]=-${COMPREPLY[i]}
+ done
+}
+
+_dashify2()
+{
+ local i
+ for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
+ COMPREPLY[i]=--${COMPREPLY[i]}
+ done
+}
+
_add_installed_spell_list()
{
COMPREPLY=( ${COMPREPLY[@]}
@@ -67,35 +83,43 @@ _gaze()
where website install installed compile sources history sum \
md5sum export import section maintainer grimoire html newer \
older prune voyeur pam orphans depends spider time version
versions \
- DETAILS CONFIGURE DEPENDS CONFLICTS PRE_BUILD BUILD POST_BUILD \
- POST_INSTALL POST_REMOVE HISTORY INSTALL FINAL' $cur ))
+ activity install-queue remove-queue show-held
show-exiled short \
+ source_urls install-full install-spell license size
grimoires dependencie \
+ time time-system \
+ BUILD CONFIGURE CONFLICTS DETAILS DEPENDS DOWNLOAD
FINAL HISTORY \
+ INSTALL INSTALL_EXTRAS PATCH POST_BUILD POST_INSTALL
POST_REMOVE \
+ POST_RESURRECT PRE_BUILD PRE_INSTALL PRE_REMOVE
PRE_RESURRECT \
+ PRE_SUB_DEPENDS PREPARE PROVIDES SECURITY SUB_DEPENDS
TRANSFER \
+ TRIGGER_CHECK TRIGGERS UP_TRIGGERS' $cur ))
elif [ $COMP_CWORD = 2 ]; then
case "$prev" in
- @(what|where|website|sources|maintainer|depends|history|version*))
+
@(what|where|website|sources|maintainer|depends|history|version|versions|short|url|source_urls))
_spell_list
return 0
;;
- @(compile|install|sum|time|md5sum))
+
@(compile|install|sum|md5sum|install-full|install-spell|size|voyeur|checkmd5s))
_spell_list
return 0
;;
installed)
+
_add_installed_spell_list
return 0
;;
- section)
- _add_section_list
+ time|time-system)
+ COMPREPLY=( $( compgen -W 'last median mean
weigh-last full' ${cur#--} ))
+ _dashify2
return 0
;;
- voyeur)
- _spell_list
+ section)
+ _add_section_list
return 0
;;
- spider)
- _spell_list
+ grimoire|html)
+ _add_grimoire_list
return 0
;;
-
@(DETAILS|CONFIGURE|DEPENDS|CONFLICTS|PRE_BUILD|BUILD|POST_BUILD|POST_INSTALL|POST_REMOVE|HISTORY|INSTALL|FINAL))
+
@(BUILD|CONFIGURE|CONFLICTS|DETAILS|DEPENDS|DOWNLOAD|FINAL|HISTORY|INSTALL|INSTALL_EXTRAS|PATCH|POST_BUILD|POST_INSTALL|POST_REMOVE|POST_RESURRECT|PRE_BUILD|PRE_INSTALL|PRE_REMOVE|PRE_RESURRECT|PRE_SUB_DEPENDS|PREPARE|PROVIDES|SECURITY|SUB_DEPENDS|TRANSFER|TRIGGER_CHECK|TRIGGERS|UP_TRIGGERS))
_spell_list
return 0
;;
@@ -103,26 +127,74 @@ _gaze()
COMPREPLY=( $( compgen -d $cur ) )
return 0
;;
+ -q)
+ _add_grimoire_list
+ return 0
+ ;;
*)
return 0
;;
esac
- else
- case "${COMP_WORDS[1]}" in
- spider)
- _spell_list
+ elif [ $COMP_CWORD = 3 ]; then
+ preprev=${COMP_WORDS[COMP_CWORD-2]}
+ case "$prev" in
+ --last|--median|--mean|--weigh-last|--full)
+ if [ $preprev = time ]; then
+ _add_installed_spell_list
+ fi
+ return 0
+ ;;
+ esac
+ fi
+ return 0
+}
+[ "$have" ] && complete -F _gaze -o default gaze
+
+have sorcery &&
+_sorcery()
+{
+ local cur prev
+
+ COMPREPLY=()
+ cur=${COMP_WORDS[COMP_CWORD]}
+ prev=${COMP_WORDS[COMP_CWORD-1]}
+ if [ $COMP_CWORD -ge 1 -o ${prev} != ${prev#-} -o ${prev} !=
${prev#--} ]; then
+ case "$cur" in
+ --*)
+ COMPREPLY=( $( compgen -W 'version help' ${cur#--} ) )
+ _dashify
+ return 0
+ ;;
+ -*)
+ COMPREPLY=( $( compgen -W 'v h u s g q r rr' ${cur#-}
) )
+ _dashify
return 0
;;
*)
+ COMPREPLY=( $( compgen -W 'update system-update
upgrade queue queue-security \
+ rebuild rebuild-reconfigure
hold unhold exile unexile add-queue \
+ remove-queue default' $cur ))
return 0
;;
esac
fi
-
+ case "$prev" in
+ hold|unhold|exile|unexile|add-queue|remove-queue)
+ _spell_list
+ return 0
+ ;;
+ default)
+ COMPREPLY=( $( compgen -W 'add remove search' $cur ) )
+ return 0
+ ;;
+ *)
return 0
+ ;;
+ esac