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

remove menu item on uninstall

Browse source
This commit is contained in:
Joey Hess 2013-12-10 00:37:06 -04:00
parent db8a980c70
commit cd765576d2
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Build/NullSoftInstaller.hs
View file

@ -69,6 +69,9 @@ uninstaller = "git-annex-uninstall.exe"
gitInstallDir :: Exp FilePath gitInstallDir :: Exp FilePath
gitInstallDir = fromString "$PROGRAMFILES\\Git\\cmd" gitInstallDir = fromString "$PROGRAMFILES\\Git\\cmd"
startMenuItem :: Exp FilePath
startMenuItem = "$SMPROGRAMS/git-annex.lnk"
needGit :: Exp String needGit :: Exp String
needGit = strConcat needGit = strConcat
[ fromString "You need git installed to use git-annex. Looking at " [ 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 page InstFiles -- Give a progress bar while installing
-- Start menu shortcut -- Start menu shortcut
Development.NSIS.createDirectory "$SMPROGRAMS" Development.NSIS.createDirectory "$SMPROGRAMS"
createShortcut "$SMPROGRAMS/git-annex.lnk" createShortcut startMenuItem
[ Target "$INSTDIR/git-annex.exe" [ Target "$INSTDIR/git-annex.exe"
, Parameters "webapp" , Parameters "webapp"
, IconFile "$INSTDIR/git-annex.exe" , IconFile "$INSTDIR/git-annex.exe"
@ -113,7 +116,8 @@ makeInstaller gitannex license extrafiles = nsis $ do
addfile license addfile license
mapM_ addfile extrafiles mapM_ addfile extrafiles
writeUninstaller $ str uninstaller writeUninstaller $ str uninstaller
uninstall $ uninstall $ do
delete [RebootOk] $ startMenuItem
mapM_ (\f -> delete [RebootOK] $ fromString $ "$INSTDIR/" ++ f) $ mapM_ (\f -> delete [RebootOK] $ fromString $ "$INSTDIR/" ++ f) $
[ gitannexprogram [ gitannexprogram
, licensefile , licensefile