From 087e0ed0b4cc4589cf2bd32ea95eea60773bb715 Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Sun, 29 Mar 2015 09:14:08 -0400 Subject: uninstaller: Remove the entire VcXsrv directory (GitHub Issue #1) --- releasenotes/releasenote_1.15.2.5.txt | 1 + xorg-server/installer/vcxsrv-64.nsi | 45 ++--------------------------------- xorg-server/installer/vcxsrv.nsi | 45 ++--------------------------------- 3 files changed, 5 insertions(+), 86 deletions(-) diff --git a/releasenotes/releasenote_1.15.2.5.txt b/releasenotes/releasenote_1.15.2.5.txt index 4bc5bee8c..bfc5482fe 100644 --- a/releasenotes/releasenote_1.15.2.5.txt +++ b/releasenotes/releasenote_1.15.2.5.txt @@ -5,6 +5,7 @@ Changes in 1.15.2.5 (X2Go/Arctica Builds) openssl 1.0.1k -> 1.0.1m libXfont 1.4.8 -> 1.4.9 - Fix plink CVE-2015-2157 +- uninstaller: Remove the entire VcXsrv directory (GitHub Issue #1) Changes in 1.15.2.4-xp+vc2013+x2go1 ------------------- diff --git a/xorg-server/installer/vcxsrv-64.nsi b/xorg-server/installer/vcxsrv-64.nsi index 14341bf54..975c8174d 100644 --- a/xorg-server/installer/vcxsrv-64.nsi +++ b/xorg-server/installer/vcxsrv-64.nsi @@ -205,52 +205,11 @@ Section "Uninstall" DeleteRegKey HKCR "Applications\xlaunch.exe" ; Remove files and uninstaller - Delete "$INSTDIR\vcxsrv.exe" - Delete "$INSTDIR\uninstall.exe" - Delete "$INSTDIR\protocol.txt" - Delete "$INSTDIR\system.XWinrc" - Delete "$INSTDIR\xkbcomp.exe" - Delete "$INSTDIR\xcalc.exe" - Delete "$INSTDIR\xcalc" - Delete "$INSTDIR\xcalc-color" - Delete "$INSTDIR\xclock.exe" - Delete "$INSTDIR\xclock" - Delete "$INSTDIR\xclock-color" - Delete "$INSTDIR\xwininfo.exe" - Delete "$INSTDIR\XKeysymDB" - Delete "$INSTDIR\XErrorDB" - Delete "$INSTDIR\Xcms.txt" - Delete "$INSTDIR\XtErrorDB" - Delete "$INSTDIR\.Xdefaults" - Delete "$INSTDIR\xlaunch.exe" - Delete "$INSTDIR\plink.exe" - Delete "$INSTDIR\swrast_dri.dll" - Delete "$INSTDIR\dxtn.dll" - Delete "$INSTDIR\swrastwgl_dri.dll" - Delete "$INSTDIR\libxcb.dll" - Delete "$INSTDIR\libXau.dll" - Delete "$INSTDIR\libX11.dll" - Delete "$INSTDIR\libXext.dll" - Delete "$INSTDIR\libXmu.dll" - Delete "$INSTDIR\libxml2.dll" - Delete "$INSTDIR\zlib1.dll" - Delete "$INSTDIR\iconv.dll" - Delete "$INSTDIR\msvcr120.dll" - Delete "$INSTDIR\msvcp120.dll" - Delete "$INSTDIR\msvcr120d.dll" - Delete "$INSTDIR\msvcp120d.dll" - - RMDir /r "$INSTDIR\fonts" - RMDir /r "$INSTDIR\xkbdata" - RMDir /r "$INSTDIR\locale" + RMDir /r "$INSTDIR" ; Remove shortcuts, if any - Delete "$SMPROGRAMS\VcXsrv\*.*" + RMDir /r "$SMPROGRAMS\VcXsrv" Delete "$DESKTOP\VcXsrv.lnk" Delete "$DESKTOP\XLaunch.lnk" - ; Remove directories used - RMDir "$SMPROGRAMS\VcXsrv" - RMDir "$INSTDIR" - SectionEnd diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index 889cf20b0..8ee07ca54 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -205,52 +205,11 @@ Section "Uninstall" DeleteRegKey HKCR "Applications\xlaunch.exe" ; Remove files and uninstaller - Delete "$INSTDIR\vcxsrv.exe" - Delete "$INSTDIR\uninstall.exe" - Delete "$INSTDIR\protocol.txt" - Delete "$INSTDIR\system.XWinrc" - Delete "$INSTDIR\xkbcomp.exe" - Delete "$INSTDIR\xcalc.exe" - Delete "$INSTDIR\xcalc" - Delete "$INSTDIR\xcalc-color" - Delete "$INSTDIR\xclock.exe" - Delete "$INSTDIR\xclock" - Delete "$INSTDIR\xclock-color" - Delete "$INSTDIR\xwininfo.exe" - Delete "$INSTDIR\XKeysymDB" - Delete "$INSTDIR\XErrorDB" - Delete "$INSTDIR\Xcms.txt" - Delete "$INSTDIR\XtErrorDB" - Delete "$INSTDIR\.Xdefaults" - Delete "$INSTDIR\xlaunch.exe" - Delete "$INSTDIR\plink.exe" - Delete "$INSTDIR\swrast_dri.dll" - Delete "$INSTDIR\dxtn.dll" - Delete "$INSTDIR\swrastwgl_dri.dll" - Delete "$INSTDIR\libxcb.dll" - Delete "$INSTDIR\libXau.dll" - Delete "$INSTDIR\libX11.dll" - Delete "$INSTDIR\libXext.dll" - Delete "$INSTDIR\libXmu.dll" - Delete "$INSTDIR\libxml2.dll" - Delete "$INSTDIR\zlib1.dll" - Delete "$INSTDIR\iconv.dll" - Delete "$INSTDIR\msvcr120.dll" - Delete "$INSTDIR\msvcp120.dll" - Delete "$INSTDIR\msvcr120d.dll" - Delete "$INSTDIR\msvcp120d.dll" - - RMDir /r "$INSTDIR\fonts" - RMDir /r "$INSTDIR\xkbdata" - RMDir /r "$INSTDIR\locale" + RMDir /r "$INSTDIR" ; Remove shortcuts, if any - Delete "$SMPROGRAMS\VcXsrv\*.*" + RMDir /r "$SMPROGRAMS\VcXsrv" Delete "$DESKTOP\VcXsrv.lnk" Delete "$DESKTOP\XLaunch.lnk" - ; Remove directories used - RMDir "$SMPROGRAMS\VcXsrv" - RMDir "$INSTDIR" - SectionEnd -- cgit v1.2.3