diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-13 14:13:09 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-13 14:24:07 -0400 |
| commit | 3ccf446ee3b084ed9fdb0405fd486323319490a0 (patch) | |
| tree | 094af4e719848da2fb17389396bcea08005198ee /Build/NullSoftInstaller.hs | |
| parent | 4fa18750e7b530fe30cf50a3cc718abdb53fbe5e (diff) | |
Windows: Renamed start menu file to avoid loop in some versions of Windows where the menu file is treated as a git-annex program.
Diffstat (limited to 'Build/NullSoftInstaller.hs')
| -rw-r--r-- | Build/NullSoftInstaller.hs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs index 846c8d621..42260bd3f 100644 --- a/Build/NullSoftInstaller.hs +++ b/Build/NullSoftInstaller.hs @@ -85,8 +85,14 @@ uninstaller = "git-annex-uninstall.exe" gitInstallDir :: Exp FilePath
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 = "$SMPROGRAMS/git-annex.lnk"
+startMenuItem = "$SMPROGRAMS/Git Annex (Webapp).lnk"
+
+oldStartMenuItem :: Exp FilePath
+oldStartMenuItem = "$SMPROGRAMS/git-annex.lnk"
autoStartItem :: Exp FilePath
autoStartItem = "$SMSTARTUP/git-annex-autostart.lnk"
@@ -125,8 +131,9 @@ makeInstaller gitannex license htmlhelp extrabins launchers = nsis $ do , StartOptions "SW_SHOWNORMAL"
, IconFile "$INSTDIR/cmd/git-annex.exe"
, IconIndex 2
- , Description "git-annex webapp"
+ , Description "Git Annex (Webapp)"
]
+ delete [RebootOK] $ oldStartMenuItem
createShortcut autoStartItem
[ Target "wscript.exe"
, Parameters "\"$INSTDIR/git-annex-autostart.vbs\""
|