web--browse: use custom commands defined at config time

Currently "git web--browse" is restricted to a set of commands defined in the script. You can subvert the "browser.<tool>.path" to force "git web--browse" to use a different command, but if you have a command whose invocation syntax does not match one of the current tools then you would have to write a wrapper script for it. This patch adds a git config variable "browser.<tool>.cmd" which allows a more flexible browser choice. If you run "git web--browse" with -t/--tool, -b/--browser or the "web.browser" config variable set to an unrecognized tool then "git web--browse" will query the "browser.<tool>.cmd" config variable. If this variable exists, then "git web--browse" will treat the specified tool as a custom command and will use a shell eval to run the command with the URLs added as extra parameters. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Christian Couder committed Mar 14, 2008 at 05:56 UTC 77e21533a938b886ed2b8636a75f76870f4805de

1 file changed +13 -2

git-web--browse.sh

+13 -2

@@ -23,12 +23,18 @@ USAGE='[--browser=browser|--tool=browser] [--config=conf.var] url/file ...'

23 NONGIT_OK=Yes

24 . git-sh-setup

26 +valid_custom_tool()

27 +{

28 + browser_cmd="$(git config "browser.$1.cmd")"

29 + test -n "$browser_cmd"

30 +}

31 +

32 valid_tool() {

33 case "$1" in

35 ;; # happy

36 *)

31 - return 1

37 + valid_custom_tool "$1" || return 1

38 ;;

39 esac

40 }

@@ -122,7 +128,7 @@ else

128

129 init_browser_path "$browser"

130

125 - if ! type "$browser_path" > /dev/null 2>&1; then

131 + if test -z "$browser_cmd" && ! type "$browser_path" > /dev/null 2>&1; then

132 die "The browser $browser is not available as '$browser_path'."

133 fi

134 fi

@@ -157,4 +163,9 @@ case "$browser" in

163 dillo)

164 "$browser_path" "$@" &

165 ;;

166 + *)

167 + if test -n "$browser_cmd"; then

168 + ( eval $browser_cmd "$@" )

169 + fi

170 + ;;

171 esac