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>
This commit is contained in:
Giuseppe Bilotta
Junio C Hamano
parent
7e4eb210bd
commit
a180055a47
@ -31,11 +31,11 @@ valid_custom_tool()
|
|||||||
|
|
||||||
valid_tool() {
|
valid_tool() {
|
||||||
case "$1" in
|
case "$1" in
|
||||||
firefox | iceweasel | chrome | google-chrome | chromium | konqueror | w3m | links | lynx | dillo | open | start)
|
firefox | iceweasel | chrome | google-chrome | chromium | konqueror | w3m | links | lynx | dillo | open | start)
|
||||||
;; # happy
|
;; # happy
|
||||||
*)
|
*)
|
||||||
valid_custom_tool "$1" || return 1
|
valid_custom_tool "$1" || return 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -46,139 +46,139 @@ init_browser_path() {
|
|||||||
|
|
||||||
while test $# != 0
|
while test $# != 0
|
||||||
do
|
do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
-b|--browser*|-t|--tool*)
|
-b|--browser*|-t|--tool*)
|
||||||
case "$#,$1" in
|
case "$#,$1" in
|
||||||
*,*=*)
|
*,*=*)
|
||||||
browser=`expr "z$1" : 'z-[^=]*=\(.*\)'`
|
browser=`expr "z$1" : 'z-[^=]*=\(.*\)'`
|
||||||
;;
|
;;
|
||||||
1,*)
|
1,*)
|
||||||
usage ;;
|
usage ;;
|
||||||
*)
|
*)
|
||||||
browser="$2"
|
browser="$2"
|
||||||
shift ;;
|
shift ;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
-c|--config*)
|
-c|--config*)
|
||||||
case "$#,$1" in
|
case "$#,$1" in
|
||||||
*,*=*)
|
*,*=*)
|
||||||
conf=`expr "z$1" : 'z-[^=]*=\(.*\)'`
|
conf=`expr "z$1" : 'z-[^=]*=\(.*\)'`
|
||||||
;;
|
;;
|
||||||
1,*)
|
1,*)
|
||||||
usage ;;
|
usage ;;
|
||||||
*)
|
*)
|
||||||
conf="$2"
|
conf="$2"
|
||||||
shift ;;
|
shift ;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
--)
|
--)
|
||||||
break
|
break
|
||||||
;;
|
;;
|
||||||
-*)
|
-*)
|
||||||
usage
|
usage
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
break
|
break
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
test $# = 0 && usage
|
test $# = 0 && usage
|
||||||
|
|
||||||
if test -z "$browser"
|
if test -z "$browser"
|
||||||
then
|
then
|
||||||
for opt in "$conf" "web.browser"
|
for opt in "$conf" "web.browser"
|
||||||
do
|
do
|
||||||
test -z "$opt" && continue
|
test -z "$opt" && continue
|
||||||
browser="`git config $opt`"
|
browser="`git config $opt`"
|
||||||
test -z "$browser" || break
|
test -z "$browser" || break
|
||||||
done
|
done
|
||||||
if test -n "$browser" && ! valid_tool "$browser"; then
|
if test -n "$browser" && ! valid_tool "$browser"; then
|
||||||
echo >&2 "git config option $opt set to unknown browser: $browser"
|
echo >&2 "git config option $opt set to unknown browser: $browser"
|
||||||
echo >&2 "Resetting to default..."
|
echo >&2 "Resetting to default..."
|
||||||
unset browser
|
unset browser
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -z "$browser" ; then
|
if test -z "$browser" ; then
|
||||||
if test -n "$DISPLAY"; then
|
if test -n "$DISPLAY"; then
|
||||||
browser_candidates="firefox iceweasel google-chrome chrome chromium konqueror w3m links lynx dillo"
|
browser_candidates="firefox iceweasel google-chrome chrome chromium konqueror w3m links lynx dillo"
|
||||||
if test "$KDE_FULL_SESSION" = "true"; then
|
if test "$KDE_FULL_SESSION" = "true"; then
|
||||||
browser_candidates="konqueror $browser_candidates"
|
browser_candidates="konqueror $browser_candidates"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
browser_candidates="w3m links lynx"
|
||||||
|
fi
|
||||||
|
# SECURITYSESSIONID indicates an OS X GUI login session
|
||||||
|
if test -n "$SECURITYSESSIONID" \
|
||||||
|
-o "$TERM_PROGRAM" = "Apple_Terminal" ; then
|
||||||
|
browser_candidates="open $browser_candidates"
|
||||||
|
fi
|
||||||
|
# /bin/start indicates MinGW
|
||||||
|
if test -x /bin/start; then
|
||||||
|
browser_candidates="start $browser_candidates"
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
browser_candidates="w3m links lynx"
|
|
||||||
fi
|
|
||||||
# SECURITYSESSIONID indicates an OS X GUI login session
|
|
||||||
if test -n "$SECURITYSESSIONID" \
|
|
||||||
-o "$TERM_PROGRAM" = "Apple_Terminal" ; then
|
|
||||||
browser_candidates="open $browser_candidates"
|
|
||||||
fi
|
|
||||||
# /bin/start indicates MinGW
|
|
||||||
if test -x /bin/start; then
|
|
||||||
browser_candidates="start $browser_candidates"
|
|
||||||
fi
|
|
||||||
|
|
||||||
for i in $browser_candidates; do
|
for i in $browser_candidates; do
|
||||||
init_browser_path $i
|
init_browser_path $i
|
||||||
if type "$browser_path" > /dev/null 2>&1; then
|
if type "$browser_path" > /dev/null 2>&1; then
|
||||||
browser=$i
|
browser=$i
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
test -z "$browser" && die "No known browser available."
|
test -z "$browser" && die "No known browser available."
|
||||||
else
|
else
|
||||||
valid_tool "$browser" || die "Unknown browser '$browser'."
|
valid_tool "$browser" || die "Unknown browser '$browser'."
|
||||||
|
|
||||||
init_browser_path "$browser"
|
init_browser_path "$browser"
|
||||||
|
|
||||||
if test -z "$browser_cmd" && ! type "$browser_path" > /dev/null 2>&1; then
|
if test -z "$browser_cmd" && ! type "$browser_path" > /dev/null 2>&1; then
|
||||||
die "The browser $browser is not available as '$browser_path'."
|
die "The browser $browser is not available as '$browser_path'."
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case "$browser" in
|
case "$browser" in
|
||||||
firefox|iceweasel)
|
firefox|iceweasel)
|
||||||
# Check version because firefox < 2.0 does not support "-new-tab".
|
# Check version because firefox < 2.0 does not support "-new-tab".
|
||||||
vers=$(expr "$($browser_path -version)" : '.* \([0-9][0-9]*\)\..*')
|
vers=$(expr "$($browser_path -version)" : '.* \([0-9][0-9]*\)\..*')
|
||||||
NEWTAB='-new-tab'
|
NEWTAB='-new-tab'
|
||||||
test "$vers" -lt 2 && NEWTAB=''
|
test "$vers" -lt 2 && NEWTAB=''
|
||||||
"$browser_path" $NEWTAB "$@" &
|
"$browser_path" $NEWTAB "$@" &
|
||||||
;;
|
;;
|
||||||
google-chrome|chrome|chromium)
|
google-chrome|chrome|chromium)
|
||||||
# Actual command for chromium is chromium-browser.
|
# Actual command for chromium is chromium-browser.
|
||||||
# No need to specify newTab. It's default in chromium
|
# No need to specify newTab. It's default in chromium
|
||||||
eval "$browser_path" "$@" &
|
eval "$browser_path" "$@" &
|
||||||
;;
|
;;
|
||||||
konqueror)
|
konqueror)
|
||||||
case "$(basename "$browser_path")" in
|
case "$(basename "$browser_path")" in
|
||||||
konqueror)
|
konqueror)
|
||||||
# It's simpler to use kfmclient to open a new tab in konqueror.
|
# It's simpler to use kfmclient to open a new tab in konqueror.
|
||||||
browser_path="$(echo "$browser_path" | sed -e 's/konqueror$/kfmclient/')"
|
browser_path="$(echo "$browser_path" | sed -e 's/konqueror$/kfmclient/')"
|
||||||
type "$browser_path" > /dev/null 2>&1 || die "No '$browser_path' found."
|
type "$browser_path" > /dev/null 2>&1 || die "No '$browser_path' found."
|
||||||
eval "$browser_path" newTab "$@"
|
eval "$browser_path" newTab "$@"
|
||||||
;;
|
;;
|
||||||
kfmclient)
|
kfmclient)
|
||||||
eval "$browser_path" newTab "$@"
|
eval "$browser_path" newTab "$@"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
"$browser_path" "$@" &
|
"$browser_path" "$@" &
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
w3m|links|lynx|open)
|
w3m|links|lynx|open)
|
||||||
eval "$browser_path" "$@"
|
eval "$browser_path" "$@"
|
||||||
;;
|
;;
|
||||||
start)
|
start)
|
||||||
exec "$browser_path" '"web-browse"' "$@"
|
exec "$browser_path" '"web-browse"' "$@"
|
||||||
;;
|
;;
|
||||||
dillo)
|
dillo)
|
||||||
"$browser_path" "$@" &
|
"$browser_path" "$@" &
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
if test -n "$browser_cmd"; then
|
if test -n "$browser_cmd"; then
|
||||||
( eval $browser_cmd "$@" )
|
( eval $browser_cmd "$@" )
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user