1 files changed, 4 insertions, 83 deletions
diff --git a/win/inspircd.nsi b/win/inspircd.nsi
index 9242d4c6a..16c6dcd3e 100644
--- a/win/inspircd.nsi
+++ b/win/inspircd.nsi
@@ -126,88 +126,8 @@ FunctionEnd
 Section Uninstall
   Delete "$INSTDIR\${PRODUCT_NAME}.url"
   Delete "$INSTDIR\uninst.exe"
-  Delete "$INSTDIR\modules\m_spanningtree.so"
-  Delete "$INSTDIR\modules\m_alias.so"
-  Delete "$INSTDIR\modules\m_alltime.so"
-  Delete "$INSTDIR\modules\m_banexception.so"
-  Delete "$INSTDIR\modules\m_blockcolor.so"
-  Delete "$INSTDIR\modules\m_chghost.so"
-  Delete "$INSTDIR\modules\m_cloaking.so"
-  Delete "$INSTDIR\modules\m_conn_lusers.so"
-  Delete "$INSTDIR\modules\m_conn_umodes.so"
-  Delete "$INSTDIR\modules\m_devoice.so"
-  Delete "$INSTDIR\modules\m_globalload.so"
-  Delete "$INSTDIR\modules\m_globops.so"
-  Delete "$INSTDIR\modules\m_hidechans.so"
-  Delete "$INSTDIR\modules\m_hideoper.so"
-  Delete "$INSTDIR\modules\m_md5.so"
-  Delete "$INSTDIR\modules\m_noctcp.so"
-  Delete "$INSTDIR\modules\m_operchans.so"
-  Delete "$INSTDIR\modules\m_randquote.so"
-  Delete "$INSTDIR\modules\m_sajoin.so"
-  Delete "$INSTDIR\modules\m_samode.so"
-  Delete "$INSTDIR\modules\m_sanick.so"
-  Delete "$INSTDIR\modules\m_sapart.so"
-  Delete "$INSTDIR\modules\m_saquit.so"
-  Delete "$INSTDIR\modules\m_services_account.so"
-  Delete "$INSTDIR\modules\m_sethost.so"
-  Delete "$INSTDIR\modules\m_setident.so"
-  Delete "$INSTDIR\modules\m_setname.so"
-  Delete "$INSTDIR\modules\m_sha256.so"
-  Delete "$INSTDIR\modules\m_showwhois.so"
-  Delete "$INSTDIR\lib\cmd_admin.so"
-  Delete "$INSTDIR\lib\cmd_away.so"
-  Delete "$INSTDIR\lib\cmd_clearcache.so"
-  Delete "$INSTDIR\lib\cmd_commands.so"
-  Delete "$INSTDIR\lib\cmd_connect.so"
-  Delete "$INSTDIR\lib\cmd_die.so"
-  Delete "$INSTDIR\lib\cmd_eline.so"
-  Delete "$INSTDIR\lib\cmd_gline.so"
-  Delete "$INSTDIR\lib\cmd_info.so"
-  Delete "$INSTDIR\lib\cmd_invite.so"
-  Delete "$INSTDIR\lib\cmd_ison.so"
-  Delete "$INSTDIR\lib\cmd_join.so"
-  Delete "$INSTDIR\lib\cmd_kick.so"
-  Delete "$INSTDIR\lib\cmd_kill.so"
-  Delete "$INSTDIR\lib\cmd_kline.so"
-  Delete "$INSTDIR\lib\cmd_links.so"
-  Delete "$INSTDIR\lib\cmd_list.so"
-  Delete "$INSTDIR\lib\cmd_loadmodule.so"
-  Delete "$INSTDIR\lib\cmd_lusers.so"
-  Delete "$INSTDIR\lib\cmd_map.so"
-  Delete "$INSTDIR\lib\cmd_mode.so"
-  Delete "$INSTDIR\lib\cmd_modules.so"
-  Delete "$INSTDIR\lib\cmd_motd.so"
-  Delete "$INSTDIR\lib\cmd_names.so"
-  Delete "$INSTDIR\lib\cmd_nick.so"
-  Delete "$INSTDIR\lib\cmd_notice.so"
-  Delete "$INSTDIR\lib\cmd_oper.so"
-  Delete "$INSTDIR\lib\cmd_part.so"
-  Delete "$INSTDIR\lib\cmd_pass.so"
-  Delete "$INSTDIR\lib\cmd_ping.so"
-  Delete "$INSTDIR\lib\cmd_pong.so"
-  Delete "$INSTDIR\lib\cmd_privmsg.so"
-  Delete "$INSTDIR\lib\cmd_qline.so"
-  Delete "$INSTDIR\lib\cmd_quit.so"
-  Delete "$INSTDIR\lib\cmd_rehash.so"
-  Delete "$INSTDIR\lib\cmd_restart.so"
-  Delete "$INSTDIR\lib\cmd_rules.so"
-  Delete "$INSTDIR\lib\cmd_server.so"
-  Delete "$INSTDIR\lib\cmd_squit.so"
-  Delete "$INSTDIR\lib\cmd_stats.so"
-  Delete "$INSTDIR\lib\cmd_summon.so"
-  Delete "$INSTDIR\lib\cmd_time.so"
-  Delete "$INSTDIR\lib\cmd_topic.so"
-  Delete "$INSTDIR\lib\cmd_trace.so"
-  Delete "$INSTDIR\lib\cmd_unloadmodule.so"
-  Delete "$INSTDIR\lib\cmd_user.so"
-  Delete "$INSTDIR\lib\cmd_userhost.so"
-  Delete "$INSTDIR\lib\cmd_users.so"
-  Delete "$INSTDIR\lib\cmd_version.so"
-  Delete "$INSTDIR\lib\cmd_wallops.so"
-  Delete "$INSTDIR\lib\cmd_who.so"
-  Delete "$INSTDIR\lib\cmd_whois.so"
-  Delete "$INSTDIR\lib\cmd_zline.so"
+  Delete "$INSTDIR\modules\m_*.so"
+  Delete "$INSTDIR\lib\cmd_*.so"
   Delete "$INSTDIR\conf\inspircd.quotes.example"
   Delete "$INSTDIR\conf\inspircd.rules.example"
   Delete "$INSTDIR\conf\inspircd.censor.example"
@@ -220,7 +140,7 @@ Section Uninstall
   Delete "$INSTDIR\InspGUI.exe"
 
   Delete "$SMPROGRAMS\InspIRCd\Uninstall.lnk"
-  Delete "$SMPROGRAMS\InspIRCd\Website.lnk"
+  Delete "$SMPROGRAMS\InspIRCd\InspIRCd Website.lnk"
   Delete "$SMPROGRAMS\InspIRCd\InspIRCd.lnk"
 
   RMDir "$SMPROGRAMS\InspIRCd"
@@ -228,6 +148,7 @@ Section Uninstall
   RMDir "$INSTDIR\lib"
   RMDir "$INSTDIR\conf"
   RMDir "$INSTDIR\bin"
+  RMDir "$INSTDIR"
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"