web--browse: coding style
Retab and deindent choices in case statements. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Giuseppe Bilotta committed
Dec 3, 2010 at 17:47 UTC
a180055a47c6793eaaba6289f623cff32644215b
1 file changed
+83
-83
git-web--browse.sh
+83
-83
@@ -31,11 +31,11 @@ valid_custom_tool()
31
32
valid_tool() {
33
case "$1" in
34
- firefox | iceweasel | chrome | google-chrome | chromium | konqueror | w3m | links | lynx | dillo | open | start)
35
- ;; # happy
36
- *)
37
- valid_custom_tool "$1" || return 1
38
- ;;
34
+ firefox | iceweasel | chrome | google-chrome | chromium | konqueror | w3m | links | lynx | dillo | open | start)
35
+ ;; # happy
36
+ *)
37
+ valid_custom_tool "$1" || return 1
38
+ ;;
39
esac
40
}
41
@@ -46,139 +46,139 @@ init_browser_path() {
46
47
while test $# != 0
48
do
49
- case "$1" in
49
+ case "$1" in
50
-b|--browser*|-t|--tool*)
51
- case "$#,$1" in
51
+ case "$#,$1" in
52
*,*=*)
53
- browser=`expr "z$1" : 'z-[^=]*=\(.*\)'`
54
- ;;
53
+ browser=`expr "z$1" : 'z-[^=]*=\(.*\)'`
54
+ ;;
55
1,*)
56
- usage ;;
56
+ usage ;;
57
*)
58
- browser="$2"
59
- shift ;;
60
- esac
61
- ;;
58
+ browser="$2"
59
+ shift ;;
60
+ esac
61
+ ;;
62
-c|--config*)
63
- case "$#,$1" in
63
+ case "$#,$1" in
64
*,*=*)
65
- conf=`expr "z$1" : 'z-[^=]*=\(.*\)'`
66
- ;;
65
+ conf=`expr "z$1" : 'z-[^=]*=\(.*\)'`
66
+ ;;
67
1,*)
68
- usage ;;
68
+ usage ;;
69
*)
70
- conf="$2"
71
- shift ;;
72
- esac
73
- ;;
70
+ conf="$2"
71
+ shift ;;
72
+ esac
73
+ ;;
74
--)
75
- break
76
- ;;
75
+ break
76
+ ;;
77
-*)
78
- usage
79
- ;;
78
+ usage
79
+ ;;
80
*)
81
- break
82
- ;;
83
- esac
84
- shift
81
+ break
82
+ ;;
83
+ esac
84
+ shift
85
done
86
87
test $# = 0 && usage
88
89
if test -z "$browser"
90
then
91
- for opt in "$conf" "web.browser"
92
- do
93
- test -z "$opt" && continue
94
- browser="`git config $opt`"
95
- test -z "$browser" || break
96
- done
97
- if test -n "$browser" && ! valid_tool "$browser"; then
98
- echo >&2 "git config option $opt set to unknown browser: $browser"
99
- echo >&2 "Resetting to default..."
100
- unset browser
101
- fi
91
+ for opt in "$conf" "web.browser"
92
+ do
93
+ test -z "$opt" && continue
94
+ browser="`git config $opt`"
95
+ test -z "$browser" || break
96
+ done
97
+ if test -n "$browser" && ! valid_tool "$browser"; then
98
+ echo >&2 "git config option $opt set to unknown browser: $browser"
99
+ echo >&2 "Resetting to default..."
100
+ unset browser
101
+ fi
102
fi
103
104
if test -z "$browser" ; then
105
- if test -n "$DISPLAY"; then
106
- browser_candidates="firefox iceweasel google-chrome chrome chromium konqueror w3m links lynx dillo"
107
- if test "$KDE_FULL_SESSION" = "true"; then
108
- browser_candidates="konqueror $browser_candidates"
105
+ if test -n "$DISPLAY"; then
106
+ browser_candidates="firefox iceweasel google-chrome chrome chromium konqueror w3m links lynx dillo"
107
+ if test "$KDE_FULL_SESSION" = "true"; then
108
+ browser_candidates="konqueror $browser_candidates"
109
+ fi
110
+ else
111
+ browser_candidates="w3m links lynx"
112
fi
110
- else
111
- browser_candidates="w3m links lynx"
112
- fi
113
- # SECURITYSESSIONID indicates an OS X GUI login session
114
- if test -n "$SECURITYSESSIONID" \
115
- -o "$TERM_PROGRAM" = "Apple_Terminal" ; then
116
- browser_candidates="open $browser_candidates"
117
- fi
118
- # /bin/start indicates MinGW
119
- if test -x /bin/start; then
120
- browser_candidates="start $browser_candidates"
121
- fi
122
-
123
- for i in $browser_candidates; do
124
- init_browser_path $i
125
- if type "$browser_path" > /dev/null 2>&1; then
126
- browser=$i
127
- break
113
+ # SECURITYSESSIONID indicates an OS X GUI login session
114
+ if test -n "$SECURITYSESSIONID" \
115
+ -o "$TERM_PROGRAM" = "Apple_Terminal" ; then
116
+ browser_candidates="open $browser_candidates"
117
fi
129
- done
130
- test -z "$browser" && die "No known browser available."
118
+ # /bin/start indicates MinGW
119
+ if test -x /bin/start; then
120
+ browser_candidates="start $browser_candidates"
121
+ fi
122
+
123
+ for i in $browser_candidates; do
124
+ init_browser_path $i
125
+ if type "$browser_path" > /dev/null 2>&1; then
126
+ browser=$i
127
+ break
128
+ fi
129
+ done
130
+ test -z "$browser" && die "No known browser available."
131
else
132
- valid_tool "$browser" || die "Unknown browser '$browser'."
132
+ valid_tool "$browser" || die "Unknown browser '$browser'."
133
134
- init_browser_path "$browser"
134
+ init_browser_path "$browser"
135
136
- if test -z "$browser_cmd" && ! type "$browser_path" > /dev/null 2>&1; then
137
- die "The browser $browser is not available as '$browser_path'."
138
- fi
136
+ if test -z "$browser_cmd" && ! type "$browser_path" > /dev/null 2>&1; then
137
+ die "The browser $browser is not available as '$browser_path'."
138
+ fi
139
fi
140
141
case "$browser" in
142
- firefox|iceweasel)
142
+firefox|iceweasel)
143
# Check version because firefox < 2.0 does not support "-new-tab".
144
vers=$(expr "$($browser_path -version)" : '.* \([0-9][0-9]*\)\..*')
145
NEWTAB='-new-tab'
146
test "$vers" -lt 2 && NEWTAB=''
147
"$browser_path" $NEWTAB "$@" &
148
;;
149
- google-chrome|chrome|chromium)
149
+google-chrome|chrome|chromium)
150
# Actual command for chromium is chromium-browser.
151
# No need to specify newTab. It's default in chromium
152
eval "$browser_path" "$@" &
153
;;
154
- konqueror)
154
+konqueror)
155
case "$(basename "$browser_path")" in
156
- konqueror)
156
+ konqueror)
157
# It's simpler to use kfmclient to open a new tab in konqueror.
158
browser_path="$(echo "$browser_path" | sed -e 's/konqueror$/kfmclient/')"
159
type "$browser_path" > /dev/null 2>&1 || die "No '$browser_path' found."
160
eval "$browser_path" newTab "$@"
161
;;
162
- kfmclient)
162
+ kfmclient)
163
eval "$browser_path" newTab "$@"
164
;;
165
- *)
165
+ *)
166
"$browser_path" "$@" &
167
;;
168
esac
169
;;
170
- w3m|links|lynx|open)
170
+w3m|links|lynx|open)
171
eval "$browser_path" "$@"
172
;;
173
- start)
174
- exec "$browser_path" '"web-browse"' "$@"
175
- ;;
176
- dillo)
173
+start)
174
+ exec "$browser_path" '"web-browse"' "$@"
175
+ ;;
176
+dillo)
177
"$browser_path" "$@" &
178
;;
179
- *)
179
+*)
180
if test -n "$browser_cmd"; then
181
- ( eval $browser_cmd "$@" )
181
+ ( eval $browser_cmd "$@" )
182
fi
183
;;
184
esac