mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Windows: Renamed start menu file to avoid loop in some versions of Windows where the menu file is treated as a git-annex program.

Browse source
This commit is contained in:
Joey Hess 2015-04-13 14:13:09 -04:00
parent 32f9392932
commit 4b6dec6a12
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Build/NullSoftInstaller.hs
View file

@ -85,8 +85,14 @@ uninstaller = "git-annex-uninstall.exe"
gitInstallDir :: Exp FilePath gitInstallDir :: Exp FilePath
gitInstallDir = fromString "$PROGRAMFILES\\Git" gitInstallDir = fromString "$PROGRAMFILES\\Git"
-- This intentionall has a different name than git-annex or
-- git-annex-webapp, since it is itself treated as an executable file.
-- Also, on XP, the filename is displayed, not the description.
startMenuItem :: Exp FilePath startMenuItem :: Exp FilePath
startMenuItem = "$SMPROGRAMS/git-annex.lnk" startMenuItem = "$SMPROGRAMS/Git Annex (Webapp).lnk"
oldStartMenuItem :: Exp FilePath
oldStartMenuItem = "$SMPROGRAMS/git-annex.lnk"
autoStartItem :: Exp FilePath autoStartItem :: Exp FilePath
autoStartItem = "$SMSTARTUP/git-annex-autostart.lnk" autoStartItem = "$SMSTARTUP/git-annex-autostart.lnk"
@ -125,8 +131,9 @@ makeInstaller gitannex license htmlhelp extrabins launchers = nsis $ do
, StartOptions "SW_SHOWNORMAL" , StartOptions "SW_SHOWNORMAL"
, IconFile "$INSTDIR/cmd/git-annex.exe" , IconFile "$INSTDIR/cmd/git-annex.exe"
, IconIndex 2 , IconIndex 2
, Description "git-annex webapp" , Description "Git Annex (Webapp)"
] ]
delete [RebootOK] $ oldStartMenuItem
createShortcut autoStartItem createShortcut autoStartItem
[ Target "wscript.exe" [ Target "wscript.exe"
, Parameters "\"$INSTDIR/git-annex-autostart.vbs\"" , Parameters "\"$INSTDIR/git-annex-autostart.vbs\""

2
debian/changelog vendored
View file

@ -7,6 +7,8 @@ git-annex (5.20150410) UNRELEASED; urgency=medium
* info dir: Added information about repositories that * info dir: Added information about repositories that
contain files in the specified directory. contain files in the specified directory.
* info: Added --bytes option. * info: Added --bytes option.
* Windows: Renamed start menu file to avoid loop in some versions
of Windows where the menu file is treated as a git-annex program.
-- Joey Hess <id@joeyh.name> Thu, 09 Apr 2015 20:59:43 -0400 -- Joey Hess <id@joeyh.name> Thu, 09 Apr 2015 20:59:43 -0400

3
doc/bugs/windows_start_menu_shortcuts_are_missing___34__Start_in__34___parameter.mdwn
View file

@ -10,3 +10,6 @@ git version 1.9.5.msysgit.1. git-annex version: 5.20150317-g237d5b0. Windows 7 P
### Please provide any additional information below. ### Please provide any additional information below.
This seems to be fixed by editing the shortcuts and setting the "Start in" parameter to the git installation directory. For me this is "C:\Program Files (x86)\Git". This seems to be fixed by editing the shortcuts and setting the "Start in" parameter to the git installation directory. For me this is "C:\Program Files (x86)\Git".
> I've renamed it. The old git-annex.lnk will be
> deleted by the installer if it exists.