[Bash-completion-commits] [SCM] bash-completion branch, master, updated. eced7126a30bb62c49924f0b2dc61f0131317c00

[Guillaume Rousse]

The following commit has been merged in the master branch:
commit ada6a3d1e84db9e4685d076a7b89d6768ec9b283
Author: Guillaume Rousse <guillomovitch at zarb.org>
Date:   Sun May 17 22:13:05 2009 +0200

    split mkisofs/genisoimage completion

diff --git a/bash_completion b/bash_completion
index 9225790..1590706 100644
--- a/bash_completion
+++ b/bash_completion
@@ -5941,78 +5941,6 @@ _cdrecord()
 } &&
 complete -F _cdrecord $filenames cdrecord wodim
 
-# mkisofs(8) completion
-#
-(have mkisofs || have genisoimage) &&
-_mkisofs()
-{
-	local cur prev
-
-	COMPREPLY=()
-	cur=`_get_cword`
-	prev=${COMP_WORDS[COMP_CWORD-1]}
-
-	case "$prev" in
-		-@(o|abstract|biblio|check-session|copyright|log-file|root-info|prep-boot|*-list))
-			_filedir
-			return 0
-			;;
-		-*-charset)
-			COMPREPLY=( $( compgen -W '$( mkisofs -input-charset \
-					help 2>&1 | tail -n +3 )' -- $cur ) )
-			return 0
-			;;
-		-uid)
-			_uids
-			return 0
-			;;
-		-gid)
-			_gids
-			return 0
-			;;
-	esac
-
-	if [[ "$cur" == -* ]]; then
-		COMPREPLY=( $( compgen -W '-abstract -A -allow-lowercase \
-				-allow-multidot -biblio -cache-inodes \
-				-no-cache-inodes -b -eltorito-alt-boot -B -G \
-				-hard-disk-boot -no-emul-boot -no-boot \
-				-boot-load-seg -boot-load-size \
-				-boot-info-table -C -c -check-oldname \
-				-check-session -copyright -d -D -dir-mode \
-				-dvd-video -f -file-mode -gid -gui \
-				-graft-points -hide -hide-list -hidden \
-				-hidden-list -hide-joliet -hide-joliet-list \
-				-hide-joliet-trans-tbl -hide-rr-moved \
-				-input-charset -output-charset -iso-level -J \
-				-joliet-long -jcharset -l -L -log-file -m \
-				-exclude-list -max-iso9660-filenames -M -N \
-				-new-dir-mode -nobak -no-bak -force-rr -no-rr \
-				-no-split-symlink-components \
-				-no-split-symlink-fields -o -pad -no-pad \
-				-path-list -P -p -print-size -quiet -R -r \
-				-relaxed-filenames -sort -split-output \
-				-stream-media-size -stream-file-name -sysid -T\
-				-table-name -ucs-level -udf -uid \
-				-use-fileversion -U -no-iso-translate -V \
-				-volset -volset-size -volset-seqno -v -x -z \
-				-hfs -apple -map -magic -hfs-creator \
-				-hfs-type -probe -no-desktop -mac-name \
-				-boot-hfs-file -part -auto -cluster-size \
-				-hide-hfs -hide-hfs-list -hfs-volid \
-				-icon-position -root-info -prep-boot \
-				-input-hfs-charset -output-hfs-charset \
-				-hfs-unlock -hfs-bless -hfs-parms --cap \
-				--netatalk --double --ethershare --ushare \
-				--exchange --sgi --xinet --macbin --single \
-				--dave --sfm --osx-double --osx-hfs' -- $cur ))
-	else
-		_filedir
-	fi
-
-} &&
-complete -F _mkisofs $filenames mkisofs genisoimage
-
 # CUPS cancel(1) completion
 #
 have cancel &&
diff --git a/contrib/genisoimage b/contrib/genisoimage
new file mode 100644
index 0000000..4ca9221
--- /dev/null
+++ b/contrib/genisoimage
@@ -0,0 +1,74 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for mkisofs/genisoimage
+
+(have mkisofs || have genisoimage) &&
+_mkisofs()
+{
+	local cur prev
+
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+
+	case "$prev" in
+		-@(o|abstract|biblio|check-session|copyright|log-file|root-info|prep-boot|*-list))
+			_filedir
+			return 0
+			;;
+		-*-charset)
+			COMPREPLY=( $( compgen -W '$( mkisofs -input-charset \
+					help 2>&1 | tail -n +3 )' -- $cur ) )
+			return 0
+			;;
+		-uid)
+			_uids
+			return 0
+			;;
+		-gid)
+			_gids
+			return 0
+			;;
+	esac
+
+	if [[ "$cur" == -* ]]; then
+		COMPREPLY=( $( compgen -W '-abstract -A -allow-lowercase \
+				-allow-multidot -biblio -cache-inodes \
+				-no-cache-inodes -b -eltorito-alt-boot -B -G \
+				-hard-disk-boot -no-emul-boot -no-boot \
+				-boot-load-seg -boot-load-size \
+				-boot-info-table -C -c -check-oldname \
+				-check-session -copyright -d -D -dir-mode \
+				-dvd-video -f -file-mode -gid -gui \
+				-graft-points -hide -hide-list -hidden \
+				-hidden-list -hide-joliet -hide-joliet-list \
+				-hide-joliet-trans-tbl -hide-rr-moved \
+				-input-charset -output-charset -iso-level -J \
+				-joliet-long -jcharset -l -L -log-file -m \
+				-exclude-list -max-iso9660-filenames -M -N \
+				-new-dir-mode -nobak -no-bak -force-rr -no-rr \
+				-no-split-symlink-components \
+				-no-split-symlink-fields -o -pad -no-pad \
+				-path-list -P -p -print-size -quiet -R -r \
+				-relaxed-filenames -sort -split-output \
+				-stream-media-size -stream-file-name -sysid -T\
+				-table-name -ucs-level -udf -uid \
+				-use-fileversion -U -no-iso-translate -V \
+				-volset -volset-size -volset-seqno -v -x -z \
+				-hfs -apple -map -magic -hfs-creator \
+				-hfs-type -probe -no-desktop -mac-name \
+				-boot-hfs-file -part -auto -cluster-size \
+				-hide-hfs -hide-hfs-list -hfs-volid \
+				-icon-position -root-info -prep-boot \
+				-input-hfs-charset -output-hfs-charset \
+				-hfs-unlock -hfs-bless -hfs-parms --cap \
+				--netatalk --double --ethershare --ushare \
+				--exchange --sgi --xinet --macbin --single \
+				--dave --sfm --osx-double --osx-hfs' -- $cur ))
+	else
+		_filedir
+	fi
+
+} &&
+complete -F _mkisofs $filenames mkisofs genisoimage

-- 
bash-completion