##// END OF EJS Templates
remove pylab from desktop entrypoint and completion
MinRK -
Show More
@@ -1,131 +1,131 b''
1 # load with: . ipython-completion.bash
1 # load with: . ipython-completion.bash
2
2
3 if [[ -n ${ZSH_VERSION-} ]]; then
3 if [[ -n ${ZSH_VERSION-} ]]; then
4 autoload -Uz bashcompinit && bashcompinit
4 autoload -Uz bashcompinit && bashcompinit
5 fi
5 fi
6
6
7 _ipython_get_flags()
7 _ipython_get_flags()
8 {
8 {
9 local url=$1
9 local url=$1
10 local var=$2
10 local var=$2
11 local dash=$3
11 local dash=$3
12 if [[ "$url $var" == $__ipython_complete_last ]]; then
12 if [[ "$url $var" == $__ipython_complete_last ]]; then
13 opts=$__ipython_complete_last_res
13 opts=$__ipython_complete_last_res
14 return
14 return
15 fi
15 fi
16 # pylab and profile don't need the = and the
16 # matplotlib and profile don't need the = and the
17 # version without simplifies the special cased completion
17 # version without simplifies the special cased completion
18 opts=$(ipython ${url} --help-all | grep -E "^-{1,2}[^-]" | sed -e "s/<.*//" -e "s/[^=]$/& /" -e "s/^--pylab=$//" -e "s/^--profile=$/--profile /")
18 opts=$(ipython ${url} --help-all | grep -E "^-{1,2}[^-]" | sed -e "s/<.*//" -e "s/[^=]$/& /" -e "s/^--matplotlib=$//" -e "s/^--profile=$/--profile /")
19 __ipython_complete_last="$url $var"
19 __ipython_complete_last="$url $var"
20 __ipython_complete_last_res="$opts"
20 __ipython_complete_last_res="$opts"
21 }
21 }
22
22
23 _ipython()
23 _ipython()
24 {
24 {
25 local cur=${COMP_WORDS[COMP_CWORD]}
25 local cur=${COMP_WORDS[COMP_CWORD]}
26 local prev=${COMP_WORDS[COMP_CWORD - 1]}
26 local prev=${COMP_WORDS[COMP_CWORD - 1]}
27 local subcommands="notebook qtconsole console kernel profile locate history nbconvert "
27 local subcommands="notebook qtconsole console kernel profile locate history nbconvert "
28 local opts=""
28 local opts=""
29 if [ -z "$__ipython_complete_baseopts" ]; then
29 if [ -z "$__ipython_complete_baseopts" ]; then
30 _ipython_get_flags baseopts
30 _ipython_get_flags baseopts
31 __ipython_complete_baseopts="${opts}"
31 __ipython_complete_baseopts="${opts}"
32 fi
32 fi
33 local baseopts="$__ipython_complete_baseopts"
33 local baseopts="$__ipython_complete_baseopts"
34 local mode=""
34 local mode=""
35 for i in "${COMP_WORDS[@]}"; do
35 for i in "${COMP_WORDS[@]}"; do
36 [ "$cur" = "$i" ] && break
36 [ "$cur" = "$i" ] && break
37 if [[ ${subcommands} == *${i}* ]]; then
37 if [[ ${subcommands} == *${i}* ]]; then
38 mode="$i"
38 mode="$i"
39 break
39 break
40 elif [[ ${i} == "--"* ]]; then
40 elif [[ ${i} == "--"* ]]; then
41 mode="nosubcommand"
41 mode="nosubcommand"
42 break
42 break
43 fi
43 fi
44 done
44 done
45
45
46
46
47 if [[ ${cur} == -* ]]; then
47 if [[ ${cur} == -* ]]; then
48 case $mode in
48 case $mode in
49 "notebook" | "qtconsole" | "console" | "kernel" | "nbconvert")
49 "notebook" | "qtconsole" | "console" | "kernel" | "nbconvert")
50 _ipython_get_flags $mode
50 _ipython_get_flags $mode
51 opts=$"${opts} ${baseopts}"
51 opts=$"${opts} ${baseopts}"
52 ;;
52 ;;
53 "locate" | "profile")
53 "locate" | "profile")
54 _ipython_get_flags $mode
54 _ipython_get_flags $mode
55 ;;
55 ;;
56 "history")
56 "history")
57 if [[ $COMP_CWORD -ge 3 ]]; then
57 if [[ $COMP_CWORD -ge 3 ]]; then
58 # 'history trim' and 'history clear' covered by next line
58 # 'history trim' and 'history clear' covered by next line
59 _ipython_get_flags history\ "${COMP_WORDS[2]}"
59 _ipython_get_flags history\ "${COMP_WORDS[2]}"
60 else
60 else
61 _ipython_get_flags $mode
61 _ipython_get_flags $mode
62
62
63 fi
63 fi
64 opts=$"${opts}"
64 opts=$"${opts}"
65 ;;
65 ;;
66 *)
66 *)
67 opts=$baseopts
67 opts=$baseopts
68 esac
68 esac
69 # don't drop the trailing space
69 # don't drop the trailing space
70 local IFS=$'\t\n'
70 local IFS=$'\t\n'
71 COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
71 COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
72 return 0
72 return 0
73 elif [[ $mode == "profile" ]]; then
73 elif [[ $mode == "profile" ]]; then
74 opts="list create locate "
74 opts="list create locate "
75 local IFS=$'\t\n'
75 local IFS=$'\t\n'
76 COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
76 COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
77 elif [[ $mode == "history" ]]; then
77 elif [[ $mode == "history" ]]; then
78 if [[ $COMP_CWORD -ge 3 ]]; then
78 if [[ $COMP_CWORD -ge 3 ]]; then
79 # drop into flags
79 # drop into flags
80 opts="--"
80 opts="--"
81 else
81 else
82 opts="trim clear "
82 opts="trim clear "
83 fi
83 fi
84 local IFS=$'\t\n'
84 local IFS=$'\t\n'
85 COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
85 COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
86 elif [[ $mode == "locate" ]]; then
86 elif [[ $mode == "locate" ]]; then
87 opts="profile"
87 opts="profile"
88 COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
88 COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
89 elif [[ ${prev} == "--pylab"* ]] || [[ ${prev} == "--gui"* ]]; then
89 elif [[ ${prev} == "--matplotlib"* ]] || [[ ${prev} == "--gui"* ]]; then
90 if [ -z "$__ipython_complete_pylab" ]; then
90 if [ -z "$__ipython_complete_matplotlib" ]; then
91 __ipython_complete_pylab=`cat <<EOF | python -
91 __ipython_complete_matplotlib=`cat <<EOF | python -
92 try:
92 try:
93 import IPython.core.shellapp as mod;
93 import IPython.core.shellapp as mod;
94 for k in mod.InteractiveShellApp.pylab.values:
94 for k in mod.InteractiveShellApp.matplotlib.values:
95 print "%s " % k
95 print "%s " % k
96 except:
96 except:
97 pass
97 pass
98 EOF
98 EOF
99 `
99 `
100 fi
100 fi
101 local IFS=$'\t\n'
101 local IFS=$'\t\n'
102 COMPREPLY=( $(compgen -W "${__ipython_complete_pylab}" -- ${cur}) )
102 COMPREPLY=( $(compgen -W "${__ipython_complete_matplotlib}" -- ${cur}) )
103 elif [[ ${prev} == "--profile"* ]]; then
103 elif [[ ${prev} == "--profile"* ]]; then
104 if [ -z "$__ipython_complete_profiles" ]; then
104 if [ -z "$__ipython_complete_profiles" ]; then
105 __ipython_complete_profiles=`cat <<EOF | python -
105 __ipython_complete_profiles=`cat <<EOF | python -
106 try:
106 try:
107 import IPython.core.profileapp
107 import IPython.core.profileapp
108 for k in IPython.core.profileapp.list_bundled_profiles():
108 for k in IPython.core.profileapp.list_bundled_profiles():
109 print "%s " % k
109 print "%s " % k
110 p = IPython.core.profileapp.ProfileList()
110 p = IPython.core.profileapp.ProfileList()
111 for k in IPython.core.profileapp.list_profiles_in(p.ipython_dir):
111 for k in IPython.core.profileapp.list_profiles_in(p.ipython_dir):
112 print "%s " % k
112 print "%s " % k
113 except:
113 except:
114 pass
114 pass
115 EOF
115 EOF
116 `
116 `
117 fi
117 fi
118 local IFS=$'\t\n'
118 local IFS=$'\t\n'
119 COMPREPLY=( $(compgen -W "${__ipython_complete_profiles}" -- ${cur}) )
119 COMPREPLY=( $(compgen -W "${__ipython_complete_profiles}" -- ${cur}) )
120 else
120 else
121 if [ "$COMP_CWORD" == 1 ]; then
121 if [ "$COMP_CWORD" == 1 ]; then
122 local IFS=$'\t\n'
122 local IFS=$'\t\n'
123 local sub=$(echo $subcommands | sed -e "s/ / \t/g")
123 local sub=$(echo $subcommands | sed -e "s/ / \t/g")
124 COMPREPLY=( $(compgen -W "${sub}" -- ${cur}) )
124 COMPREPLY=( $(compgen -W "${sub}" -- ${cur}) )
125 else
125 else
126 COMPREPLY=( $(compgen -f -- ${cur}) )
126 COMPREPLY=( $(compgen -f -- ${cur}) )
127 fi
127 fi
128 fi
128 fi
129
129
130 }
130 }
131 complete -o default -o nospace -F _ipython ipython
131 complete -o default -o nospace -F _ipython ipython
@@ -1,24 +1,24 b''
1 # If you want ipython to appear in a linux app launcher ("start menu"), install this by doing:
1 # If you want ipython to appear in a linux app launcher ("start menu"), install this by doing:
2 # sudo desktop-file-install ipython-qtconsole.desktop
2 # sudo desktop-file-install ipython-qtconsole.desktop
3
3
4 [Desktop Entry]
4 [Desktop Entry]
5 Comment=Enhanced interactive Python qtconsole
5 Comment=Enhanced interactive Python qtconsole
6 Exec=ipython qtconsole
6 Exec=ipython qtconsole
7 GenericName[en_US]=Python shell
7 GenericName[en_US]=Python shell
8 GenericName=Python shell
8 GenericName=Python shell
9 Icon=gnome-netstatus-idle
9 Icon=gnome-netstatus-idle
10 Name[en_US]=IPython Qt console
10 Name[en_US]=IPython Qt console
11 Name=IPython Qt console
11 Name=IPython Qt console
12 Categories=Development;Utility;
12 Categories=Development;Utility;
13 StartupNotify=false
13 StartupNotify=false
14 Terminal=false
14 Terminal=false
15 Type=Application
15 Type=Application
16 Actions=Pylab;Pylabinline;
16 Actions=Matplotlib;Matplotlibinline;
17
17
18 [Desktop Action Pylab]
18 [Desktop Action Matplotlib]
19 Name=Pylab
19 Name=Matplotlib
20 Exec=ipython qtconsole --pylab
20 Exec=ipython qtconsole --matplotlib
21
21
22 [Desktop Action Pylabinline]
22 [Desktop Action Matplotlibinline]
23 Name=Pylab (inline plots)
23 Name=Matplotlib (inline plots)
24 Exec=ipython qtconsole --pylab=inline
24 Exec=ipython qtconsole --matplotlib=inline
General Comments 0
You need to be logged in to leave comments. Login now