iconv has been removed in ruby 2, use glib instead (pterjan)

[booh] / booh.bash-completion

diff --git a/booh.bash-completion b/booh.bash-completion
index 1588a27e21ab8390171aea3408c7e6535a471e8c..7e9f641f51ef4c460fa982f7a70cc27138ae56b7 100644 (file)
--- a/booh.bash-completion
+++ b/booh.bash-completion
@@ -9,11 +9,11 @@ _booh-backend()
        prev=${COMP_WORDS[COMP_CWORD-1]}
 
        case $prev in
        prev=${COMP_WORDS[COMP_CWORD-1]}
 
        case $prev in

-               -@(s|d|-source|-destination))
+               -@(s|d|D|-source|-destination|-dir))

                        _filedir -d
                        return 0
                        ;;
                        _filedir -d
                        return 0
                        ;;

-               -@(C|M|N|u|-config|-merge-config|-merge-config-newdirs|-use-config))
+               -@(C|M|U|O|N|u|-config|-merge-config|-merge-config-onedir|-merge-config-subdirs|-use-config))

                        _filedir
                        return 0
                        ;;
                        _filedir
                        return 0
                        ;;


@@ -28,12 +28,38 @@ _booh-backend()
        esac
 
        if [[ "$cur" == -* ]]; then
        esac
 
        if [[ "$cur" == -* ]]; then

-               COMPREPLY=( $( compgen -W '-h --help -V --version -n \
-                       --no-check -s --source -d --destination -t \
-                       --theme -C --config -k --config-skel -M \
-                       --merge-config -N --merge-config-newdirs -u \
-                       --use-config -S --sizes -m --mproc -g \
-                       --for-gui -v --verbose-level' -- $cur ) )
+               COMPREPLY=( $( compgen -W '-h --help -V --version \
+                       -s --source -d --destination -t --theme \
+                        -C --config -k --config-skel -M \
+                       --merge-config -O --merge-config-onedir \
+                        -U --merge-config-subdirs -D --dir -u \
+                       --use-config -f --force -S --sizes -T \
+                        --thumbnails-per-row -p --thumbnails-per-page \
+                        -L --multi-languages \
+                        -o --optimize-for-32 \
+                        -r --transcode-videos \
+                        -l --index-link \
+                        -n --made-with -c --comments-format \
+                        -m --mproc -g --for-gui -v \
+                        --verbose-level' -- $cur ) )

        fi
 }
        fi
 }

+
+_booh-classifier()
+{
+       local cur prev
+
+       COMPREPLY=()
+       cur=${COMP_WORDS[COMP_CWORD]}
+       prev=${COMP_WORDS[COMP_CWORD-1]}
+
+       if [[ "$cur" == -* ]]; then
+               COMPREPLY=( $( compgen -W '-h --help -v --verbose-level -s --sort-by-exif-date' -- $cur ) )
+       else
+               _filedir -d
+        fi
+}
+

 complete -F _booh-backend booh-backend
 complete -F _booh-backend booh-backend

+complete -F _booh-classifier booh-classifier
+