[vmware*] Cleanup deletion list mess

2 files changed, 24 insertions, 164 deletions

diff --git a/core/modules/vmware12/module.conf b/core/modules/vmware12/module.conf
index b11b8884..37ec1f62 100644
--- a/core/modules/vmware12/module.conf
+++ b/core/modules/vmware12/module.conf
@@ -26,45 +26,42 @@ REQUIRED_BINARIES="
 "
 
 REQUIRED_VMWARE_DELETIONS="
-	/var/lib/vmware
-	/etc/vmw*
-	/etc/rc?.d/???vmware*
-	/etc/rc0.d/K06vmware-workstation-server
-	/etc/pam.d/vmware-authd
-	/etc/rc3.d/S25vmamqpd
-	/etc/xdg/menus/applications-merged
-	/etc/init.d/vmamqpd
-	/etc/init.d/vmware*
-	/etc/thnuclnt
 	/etc/cups/thnuclnt.convs
 	/etc/cups/thnuclnt.types
+	/etc/init.d/vmamqpd
+	/etc/init.d/vmware*
 	/etc/modprobe.d/vmware-fuse.conf
-	/lib/modules/*-generic/misc/vmnet.ko
+	/etc/pam.d/vmware-authd
+	/etc/rc?.d/???vmamqp*
+	/etc/rc?.d/???vmware*
+	/etc/thnuclnt
+	/etc/vmware*
+	/etc/xdg/menus/applications-merged
 	/lib/modules/*-generic/misc/vmmon.ko
-	/usr/share/mime/packages/vmware-player.xml
-	/usr/share/applications/vmware*
-	/usr/share/desktop-directories/vmware-ace-vms.directory
-	/usr/share/man/man1/vmware.1.gz
-	/usr/share/doc/vmware*
-	/usr/share/icons/hicolor/*/mimetypes/application-certificate.png
-	/usr/share/icons/hicolor/*/apps/vmware*
-	/usr/share/icons/hicolor/*/mimetypes/*vmware*
-	/usr/bin/vmnet-dhcpd
+	/lib/modules/*-generic/misc/vmnet.ko
 	/usr/bin/ovftool
-	/usr/bin/vmrun
-	/usr/bin/vmware-wssc-adminTool
-	/usr/bin/vmnet-bridge
-	/usr/bin/vmplayer
-	/usr/bin/vmnet-sniffer
-	/usr/bin/vmss2core
 	/usr/bin/vm-support
+	/usr/bin/vmnet-bridge
+	/usr/bin/vmnet-dhcpd
 	/usr/bin/vmnet-natd
 	/usr/bin/vmnet-netifup
+	/usr/bin/vmnet-sniffer
+	/usr/bin/vmplayer
+	/usr/bin/vmrun
+	/usr/bin/vmss2core
 	/usr/bin/vmware*
 	/usr/include/vmware-vix
-	/usr/lib/libvixAllProducts.so
 	/usr/lib/cups/filter/thnucups
 	/usr/lib/diskLibWrapper.so
+	/usr/lib/libvixAllProducts.so
 	/usr/lib/vmware*
 	/usr/sbin/vmware*
+	/usr/share/applications/vmware*
+	/usr/share/desktop-directories/vmware-ace-vms.directory
+	/usr/share/doc/vmware*
+	/usr/share/icons/hicolor/*/apps/vmware*
+	/usr/share/icons/hicolor/*/mimetypes/*vmware*
+	/usr/share/man/man1/vmware.1.gz
+	/usr/share/mime/packages/vmware-player.xml
+	/var/lib/vmware
 "
diff --git a/core/modules/vmware12/module.conf.ubuntu b/core/modules/vmware12/module.conf.ubuntu
deleted file mode 100644
index 09b01ee9..00000000
--- a/core/modules/vmware12/module.conf.ubuntu
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/bin/bash
-REQUIRED_VMWARE_DELETIONS="
-	/var/lib/vmware
-	/etc/vmware-vix
-	/etc/rc0.d/K08vmware
-	/etc/rc0.d/K06vmware-workstation-server
-	/etc/rc0.d/K06vmamqpd
-	/etc/pam.d/vmware-authd
-	/etc/rc3.d/S19vmware
-	/etc/rc3.d/S55vmware-workstation-server
-	/etc/rc3.d/S25vmamqpd
-	/etc/rc3.d/K08vmware-USBArbitrator
-	/etc/rc3.d/S50vmware-USBArbitrator
-	/etc/rc5.d/K08vmware-USBArbitrator
-	/etc/rc5.d/S50vmware-USBArbitrator
-	/etc/rc2.d/S19vmware
-	/etc/rc2.d/S55vmware-workstation-server
-	/etc/rc2.d/S25vmamqpd
-	/etc/rc2.d/K08vmware-USBArbitrator
-	/etc/rc2.d/S50vmware-USBArbitrator
-	/etc/xdg/menus/applications-merged
-	/etc/rc6.d/K08vmware
-	/etc/rc6.d/K06vmware-workstation-server
-	/etc/rc6.d/K06vmamqpd
-	/etc/rc4.d/S19vmware
-	/etc/rc4.d/S55vmware-workstation-server
-	/etc/rc4.d/S25vmamqpd
-	/etc/init.d/vmamqpd
-	/etc/init.d/vmware-USBArbitrator
-	/etc/init.d/vmware-workstation-server
-	/etc/init.d/vmware
-	/etc/thnuclnt
-	/etc/vmware-installer
-	/etc/cups/thnuclnt.convs
-	/etc/cups/thnuclnt.types
-	/etc/vmware/netmap.conf
-	/etc/vmware/icu
-	/etc/vmware/hostd
-	/etc/vmware/installer.sh
-	/etc/vmware/bootstrap
-	/etc/vmware/ssl
-	/etc/vmware/config
-	/etc/vmware/locations
-	/etc/modprobe.d/vmware-fuse.conf
-	/lib/modules/3.11.0-13-generic/misc/vmnet.ko
-	/lib/modules/3.11.0-13-generic/misc/vmmon.ko
-	/usr/share/mime/packages/vmware-player.xml
-	/usr/share/applications/vmware-workstation.desktop
-	/usr/share/applications/vmware-player.desktop
-	/usr/share/applications/vmware-netcfg.desktop
-	/usr/share/desktop-directories/vmware-ace-vms.directory
-	/usr/share/man/man1/vmware.1.gz
-	/usr/share/doc/vmware-vix
-	/usr/share/doc/vmware-workstation
-	/usr/share/doc/vmware-player
-	/usr/share/icons/hicolor/32x32/mimetypes/application-certificate.png
-	/usr/share/icons/hicolor/32x32/mimetypes/application-x-vmware-easter-egg.png
-	/usr/share/icons/hicolor/32x32/mimetypes/application-x-vmware-team.png
-	/usr/share/icons/hicolor/32x32/mimetypes/application-x-vmware-vm-legacy.png
-	/usr/share/icons/hicolor/32x32/mimetypes/application-x-vmware-vm-clone.png
-	/usr/share/icons/hicolor/32x32/mimetypes/application-x-vmware-vm.png
-	/usr/share/icons/hicolor/32x32/apps/vmware-player.png
-	/usr/share/icons/hicolor/32x32/apps/vmware-workstation.png
-	/usr/share/icons/hicolor/48x48/mimetypes/application-x-vmware-vmfoundry.png
-	/usr/share/icons/hicolor/48x48/mimetypes/application-x-vmware-vmdisk.png
-	/usr/share/icons/hicolor/48x48/mimetypes/application-x-vmware-easter-egg.png
-	/usr/share/icons/hicolor/48x48/mimetypes/application-x-vmware-team.png
-	/usr/share/icons/hicolor/48x48/mimetypes/application-x-vmware-vm-legacy.png
-	/usr/share/icons/hicolor/48x48/mimetypes/application-x-vmware-vm-clone.png
-	/usr/share/icons/hicolor/48x48/mimetypes/application-x-vmware-snapshot.png
-	/usr/share/icons/hicolor/48x48/mimetypes/application-x-vmware-vm.png
-	/usr/share/icons/hicolor/48x48/apps/vmware-player.png
-	/usr/share/icons/hicolor/48x48/apps/vmware-workstation.png
-	/usr/share/icons/hicolor/scalable/mimetypes/application-x-vmware-easter-egg.svg
-	/usr/share/icons/hicolor/scalable/mimetypes/application-x-vmware-team.svg
-	/usr/share/icons/hicolor/scalable/mimetypes/application-x-vmware-vm-clone.svg
-	/usr/share/icons/hicolor/scalable/mimetypes/application-x-vmware-snapshot.svg
-	/usr/share/icons/hicolor/scalable/mimetypes/application-x-vmware-vm-legacy.svg
-	/usr/share/icons/hicolor/scalable/mimetypes/application-x-vmware-vmfoundry.svg
-	/usr/share/icons/hicolor/scalable/mimetypes/application-certificate.svg
-	/usr/share/icons/hicolor/scalable/mimetypes/application-x-vmware-vm.svg
-	/usr/share/icons/hicolor/scalable/apps/vmware-workstation.svg
-	/usr/share/icons/hicolor/16x16/mimetypes/application-certificate.png
-	/usr/share/icons/hicolor/16x16/mimetypes/application-x-vmware-easter-egg.png
-	/usr/share/icons/hicolor/16x16/mimetypes/application-x-vmware-team.png
-	/usr/share/icons/hicolor/16x16/mimetypes/application-x-vmware-vm-legacy.png
-	/usr/share/icons/hicolor/16x16/mimetypes/application-x-vmware-vm-clone.png
-	/usr/share/icons/hicolor/16x16/mimetypes/application-x-vmware-vm.png
-	/usr/share/icons/hicolor/16x16/apps/vmware-player.png
-	/usr/share/icons/hicolor/16x16/apps/vmware-netcfg.png
-	/usr/share/icons/hicolor/16x16/apps/vmware-workstation.png
-	/usr/share/icons/hicolor/24x24/mimetypes
-	/usr/share/icons/hicolor/24x24/apps/vmware-player.png
-	/usr/share/icons/hicolor/24x24/apps/vmware-netcfg.png
-	/usr/share/icons/hicolor/24x24/apps/vmware-workstation.png
-	/usr/bin/vmnet-dhcpd
-	/usr/bin/vmware-unity-helper
-	/usr/bin/ovftool
-	/usr/bin/vmrun
-	/usr/bin/vmware-vim-cmd
-	/usr/bin/vmware-wssc-adminTool
-	/usr/bin/vmnet-bridge
-	/usr/bin/vmplayer
-	/usr/bin/vmnet-sniffer
-	/usr/bin/vmss2core
-	/usr/bin/vmware-usbarbitrator
-	/usr/bin/vmware-netcfg
-	/usr/bin/vmware-modconfig
-	/usr/bin/vmware-tray
-	/usr/bin/vmware-mount
-	/usr/bin/vm-support
-	/usr/bin/vmware-vdiskmanager
-	/usr/bin/vmware-license-enter.sh
-	/usr/bin/vmware-license-check.sh
-	/usr/bin/vmnet-natd
-	/usr/bin/vmware-uninstall
-	/usr/bin/vmware-vprobe
-	/usr/bin/vmware-fuseUI
-	/usr/bin/vmware-installer
-	/usr/bin/vmware-ping
-	/usr/bin/vmware-gksu
-	/usr/bin/vmnet-netifup
-	/usr/bin/vmware-networks
-	/usr/bin/vmware
-	/usr/bin/vmware-hostd
-	/usr/include/vmware-vix
-	/usr/lib/vmware-vix
-	/usr/lib/vmware-ovftool
-	/usr/lib/vmware-installer
-	/usr/lib/libvixAllProducts.so
-	/usr/lib/cups/filter/thnucups
-	/usr/lib/diskLibWrapper.so
-	/usr/lib/vmware
-	/usr/local/share/applications
-	/usr/sbin/vmware-authdlauncher
-	/usr/sbin/vmware-authd
-"