summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-12-10 00:37:06 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-12-10 00:37:06 -0400
commit17b95ba8d6de903da6a91fe603e210912dfb7127 (patch)
tree3cef1b2efac520b014f310014b44027c7800afd3 /Build
parent532d91074516a375221c83a39bfea1623c747673 (diff)
remove menu item on uninstall
Diffstat (limited to 'Build')
-rw-r--r--Build/NullSoftInstaller.hs8
1 files changed, 6 insertions, 2 deletions
diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs
index 908da352c..d50e66e24 100644
--- a/Build/NullSoftInstaller.hs
+++ b/Build/NullSoftInstaller.hs
@@ -69,6 +69,9 @@ uninstaller = "git-annex-uninstall.exe"
gitInstallDir :: Exp FilePath
gitInstallDir = fromString "$PROGRAMFILES\\Git\\cmd"
+startMenuItem :: Exp FilePath
+startMenuItem = "$SMPROGRAMS/git-annex.lnk"
+
needGit :: Exp String
needGit = strConcat
[ fromString "You need git installed to use git-annex. Looking at "
@@ -97,7 +100,7 @@ makeInstaller gitannex license extrafiles = nsis $ do
page InstFiles -- Give a progress bar while installing
-- Start menu shortcut
Development.NSIS.createDirectory "$SMPROGRAMS"
- createShortcut "$SMPROGRAMS/git-annex.lnk"
+ createShortcut startMenuItem
[ Target "$INSTDIR/git-annex.exe"
, Parameters "webapp"
, IconFile "$INSTDIR/git-annex.exe"
@@ -113,7 +116,8 @@ makeInstaller gitannex license extrafiles = nsis $ do
addfile license
mapM_ addfile extrafiles
writeUninstaller $ str uninstaller
- uninstall $
+ uninstall $ do
+ delete [RebootOk] $ startMenuItem
mapM_ (\f -> delete [RebootOK] $ fromString $ "$INSTDIR/" ++ f) $
[ gitannexprogram
, licensefile