Ignore:
Timestamp:
2009-03-21T16:40:49+01:00 (17 years ago)
Author:
ulf
Message:

put plugins only into personal folders, otherwise we get in conflict with the JOSM internal plugin update mechanism

cleanup of uninstall stuff

File:
1 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/nsis/josm.nsi

    r14194 r14196  
    260260;
    261261SectionIn 1 2 RO
    262 SetShellVarContext all
     262SetShellVarContext current
    263263
    264264SetOutPath $INSTDIR
    … …  
    319319;-------------------------------------------
    320320SectionIn 1 2
    321 SetShellVarContext all
     321SetShellVarContext current
    322322SetOutPath $APPDATA\JOSM\plugins
    323323File "..\dist\wmsplugin.jar"
    … …  
    336336;-------------------------------------------
    337337SectionIn 1 2
    338 SetShellVarContext all
     338SetShellVarContext current
    339339SetOutPath $APPDATA\JOSM\plugins
    340340File "..\dist\validator.jar"
    … …  
    402402;
    403403SectionIn 1 2
    404 SetShellVarContext all
     404SetShellVarContext current
    405405
    406406Delete "$INSTDIR\josm.exe"
    … …  
    418418Delete "$INSTDIR\webkit-image.exe"
    419419Delete "$INSTDIR\uninstall.exe"
    420 Delete "$APPDATA\JOSM\plugins\wmsplugin.jar"
    421 Delete "$APPDATA\JOSM\plugins\namefinder.jar"
    422 Delete "$APPDATA\JOSM\plugins\validator.jar"
    423 RMDir "$APPDATA\JOSM\plugins"
    424 RMDir "$APPDATA\JOSM"
    425420
    426421DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM"
    … …  
    455450SectionIn 2
    456451SetShellVarContext current
     452Delete "$APPDATA\JOSM\plugins\wmsplugin\*.*"
     453RMDir "$APPDATA\JOSM\plugins\wmsplugin"
     454Delete "$APPDATA\JOSM\plugins\validator\*.*"
     455RMDir "$APPDATA\JOSM\plugins\validator"
     456Delete "$APPDATA\JOSM\plugins\*.*"
     457RMDir "$APPDATA\JOSM\plugins"
     458
     459Delete "$APPDATA\JOSM\motd.html"
    457460Delete "$APPDATA\JOSM\preferences"
    458461Delete "$APPDATA\JOSM\bookmarks"
    459 RMDir "$APPDATA\JOSM"
    460 SectionEnd
    461 
    462 Section /o "un.$(un.JOSM_SEC_PLUGINS)"un.SecPlugins
    463 ;-------------------------------------------
    464 SectionIn 2
    465 SetShellVarContext current
    466 Delete "$APPDATA\JOSM\plugins\wmsplugin.jar"
    467 Delete "$APPDATA\JOSM\plugins\namefinder.jar"
    468 Delete "$APPDATA\JOSM\plugins\validator\*.*"
    469 Delete "$APPDATA\JOSM\plugins\validator.jar"
    470 RMDir "$APPDATA\JOSM\plugins\validator"
    471 RMDir "$APPDATA\JOSM\plugins"
    472462RMDir "$APPDATA\JOSM"
    473463SectionEnd
    … …  
    503493  !insertmacro MUI_DESCRIPTION_TEXT ${un.SecUinstall} $(un.JOSM_SECDESC_UNINSTALL)
    504494  !insertmacro MUI_DESCRIPTION_TEXT ${un.SecPersonalSettings} $(un.JOSM_SECDESC_PERSONAL_SETTINGS)
    505   !insertmacro MUI_DESCRIPTION_TEXT ${un.SecPlugins} $(un.JOSM_SECDESC_PLUGINS)
    506495!insertmacro MUI_UNFUNCTION_DESCRIPTION_END
    507496
Note: See TracChangeset for help on using the changeset viewer.