git-gui: Ensure windows shortcuts always have .bat extension

Apparently under some setups on Windows Tk is hiding our file
extension recommendation of ".bat" from the user and that is
allowing the user to create a shortcut file which has no file
extension.  Double clicking on such a file in Windows Explorer
brings up the associate file dialog, as Windows does not know
what application to launch.

We now append the file extension ".bat" to the filename of the
shortcut file if it has no extension or if it has one but it is
not ".bat".

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/lib/shortcut.tcl b/lib/shortcut.tcl
index ebf72e44521feac5619842227f61e4e5f26a819a..a0a1b7dddd0eab743fac896316d3410848b703a2 100644 (file)
--- a/lib/shortcut.tcl
+++ b/lib/shortcut.tcl
@@ -9,6 +9,9 @@ proc do_windows_shortcut {} {
                -title "[appname] ([reponame]): Create Desktop Icon" \
                -initialfile "Git [reponame].bat"]
        if {$fn != {}} {
                -title "[appname] ([reponame]): Create Desktop Icon" \
                -initialfile "Git [reponame].bat"]
        if {$fn != {}} {

+               if {[file extension $fn] ne {.bat}} {
+                       set fn ${fn}.bat
+               }

                if {[catch {
                                set fd [open $fn w]
                                puts $fd "@ECHO Entering [reponame]"
                if {[catch {
                                set fd [open $fn w]
                                puts $fd "@ECHO Entering [reponame]"


@@ -42,6 +45,9 @@ proc do_cygwin_shortcut {} {
                -initialdir $desktop \
                -initialfile "Git [reponame].bat"]
        if {$fn != {}} {
                -initialdir $desktop \
                -initialfile "Git [reponame].bat"]
        if {$fn != {}} {

+               if {[file extension $fn] ne {.bat}} {
+                       set fn ${fn}.bat
+               }

                if {[catch {
                                set fd [open $fn w]
                                set sh [exec cygpath \
                if {[catch {
                                set fd [open $fn w]
                                set sh [exec cygpath \