sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Bor Kraljič (691586e302287762ee1f54ac04de720ad9bed922)

From: Bor Kraljič <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (691586e302287762ee1f54ac04de720ad9bed922)
Date: Mon, 25 Oct 2010 12:22:24 -0500

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

shell-term-fm/bash-completion/DETAILS | 2
shell-term-fm/bash-completion/HISTORY | 4 +
shell-term-fm/bash-completion/smgl_completion | 76
+++++++++++++-------------
3 files changed, 45 insertions(+), 37 deletions(-)

New commits:
commit 691586e302287762ee1f54ac04de720ad9bed922
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

bash-completion: minor fixes and updates of smgl_completion

diff --git a/shell-term-fm/bash-completion/DETAILS
b/shell-term-fm/bash-completion/DETAILS
index 9197e5d..ab27c66 100755
--- a/shell-term-fm/bash-completion/DETAILS
+++ b/shell-term-fm/bash-completion/DETAILS
@@ -6,7 +6,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://bash-completion.alioth.debian.org/files/$SOURCE
WEB_SITE=http://bash-completion.alioth.debian.org/
ENTERED=20020215
- PATCHLEVEL=0
+ PATCHLEVEL=1
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 62e0353..f5934de 100644
--- a/shell-term-fm/bash-completion/HISTORY
+++ b/shell-term-fm/bash-completion/HISTORY
@@ -1,3 +1,7 @@
+2010-10-25 Bor Kraljič <pyrobor AT ver.si>
+ * smgl_completion: minor fixes and updates
+ * DETAILS: PATCHLEVEL++
+
2010-07-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2, updated WEB_SITE, SOURCE_URL[0] and SOURCE_DIRECTORY
* BUILD, CONFIGURE, PRE_BUILD, start_completion: removed
diff --git a/shell-term-fm/bash-completion/smgl_completion
b/shell-term-fm/bash-completion/smgl_completion
index 8b9525c..2ee8913 100644
--- a/shell-term-fm/bash-completion/smgl_completion
+++ b/shell-term-fm/bash-completion/smgl_completion
@@ -28,26 +28,22 @@ _dashify()
done
}

-_dashify1()
+_add_installed_spell_list()
{
- local i
- for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
- COMPREPLY[i]=-${COMPREPLY[i]}
- done
+ COMPREPLY=( ${COMPREPLY[@]}
+ $( sed -ne 's/^$'$cur'.*$:[0-9]*:installed:[0-9a-z.\-]*$/\1/p'
$SPELL_STATUS ) )
}

-_dashify2()
+_add_held_spell_list()
{
- local i
- for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
- COMPREPLY[i]=--${COMPREPLY[i]}
- done
+ COMPREPLY=( ${COMPREPLY[@]}
+ $( sed -ne 's/^$'$cur'.*$:[0-9]*:held:[0-9a-z.\-]*$/\1/p' $SPELL_STATUS
) )
}

-_add_installed_spell_list()
+_add_exiled_spell_list()
{
- COMPREPLY=( ${COMPREPLY[@]}
- $( sed -ne 's/^$'$cur'.*$:[0-9]*:installed:[0-9a-z.]*$/\1/p'
$SPELL_STATUS ) )
+ COMPREPLY=( ${COMPREPLY[@]}
+ $( sed -ne 's/^$'$cur'.*$:[0-9]*:exiled:[0-9a-z.\-]*$/\1/p'
$SPELL_STATUS ) )
}

_add_section_list()
@@ -86,7 +82,7 @@ _gaze()
older prune voyeur pam orphans depends spider time version
versions \
activity install-queue remove-queue show-held
show-exiled short \
source_urls install-full install-spell license size
grimoires dependencies \
- time time-system \
+ time time-system system-info \
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 \
@@ -94,7 +90,7 @@ _gaze()
TRIGGER_CHECK TRIGGERS UP_TRIGGERS' $cur ))
elif [ $COMP_CWORD = 2 ]; then
case "$prev" in
-
@(what|where|website|sources|maintainer|depends|history|version|versions|short|url|source_urls))
+
@(what|where|website|sources|maintainer|depends|dependencies|history|version|versions|short|url|source_urls))
_spell_list
return 0
;;
@@ -103,14 +99,13 @@ _gaze()
return 0
;;
installed)
-
_add_installed_spell_list
return 0
;;
time|time-system)
- COMPREPLY=( $( compgen -W 'last median mean
weigh-last full' ${cur#--} ))
- _dashify2
- return 0
+ COMPREPLY=( $( compgen -W 'last median mean weigh-last full'
${cur#--} ))
+ _dashify
+ return 0
;;
section)
_add_section_list
@@ -175,26 +170,31 @@ _sorcery()
_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)
+ hold|exile|add-queue|remove-queue)
_spell_list
return 0
;;
+ unhold)
+ _add_held_spell_list
+ return 0
+ ;;
+ unexile)
+ _add_exiled_spell_list
+ return 0
+ ;;
default)
COMPREPLY=( $( compgen -W 'add remove search' $cur ) )
return 0
;;
- *)
- 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

return 0
@@ -263,12 +263,12 @@ _summon()
if [ $COMP_CWORD -ge 1 -o ${prev} != ${prev#-} -o ${prev} != ${prev#--}
]; then
case "$cur" in
--*)
- COMPREPLY=( $( compgen -W 'from url download queue all'
${cur#--} ) )
+ COMPREPLY=( $( compgen -W 'from url download queue all print
raw' ${cur#--} ) )
_dashify
return 0
;;
-*)
- COMPREPLY=( $( compgen -W 'd' ${cur#-} ) )
+ COMPREPLY=( $( compgen -W 'd p g r' ${cur#-} ) )
_dashify
return 0
;;
@@ -279,6 +279,10 @@ _summon()
COMPREPLY=( $( compgen -d $cur ) )
return 0
;;
+ --print|-p)
+ COMPREPLY=( $( compgen -d 'raw source one_url all_urls' $cur ) )
+ return 0
+ ;;
*)
_spell_list
return 0
@@ -318,7 +322,7 @@ _dispel()
esac
fi
case "$prev" in
-
--user-child-deps|--user-parent-deps|--recast-parent|--non-orphan|--orphan|--user-deps|--dispel-parent)
+ --recast-parent|--non-orphan|--orphan|--dispel-parent)
COMPREPLY=( $( compgen -W 'ignore ask-yes ask-no always' $cur
) )
return 0 ;;
*)
@@ -401,9 +405,6 @@ _cleanse()
esac
fi
case "$prev" in
- --fix|--nofix|--nofix_quick|--tablet_spell|*)
- _add_installed_spell_list
- return 0 ;;
--delint)
COMPREPLY=( $( compgen -W 'full' ${cur} ) )
return 0 ;;
@@ -413,6 +414,9 @@ _cleanse()
--tablet)
COMPREPLY=( $( compgen -W 'coalesce' ${cur} ) )
return 0 ;;
+ --fix|--nofix|--nofix_quick|--tablet_spell|*)
+ _add_installed_spell_list
+ return 0 ;;
esac
return 0
}
@@ -475,7 +479,7 @@ _scribe()

if [ $COMP_CWORD = 1 ]; then
COMPREPLY=( $( compgen -W 'update add remove fix index reindex set \
- swap localize unlocalize' $cur ))
+ swap localize unlocalize reindex-keyword reindex-version'
$cur ))
elif [ $COMP_CWORD = 2 ]; then
case "$prev" in

@(update|remove|fix|reindex|reindex-keyword|reindex-version|set|swap|localize|unlocalize))

[SM-Commit] GIT changes to master grimoire by Bor Kraljič (691586e302287762ee1f54ac04de720ad9bed922), Bor Kraljič, 10/25/2010