diff --git a/WAPT/control b/WAPT/control index 035967b..39a2099 100644 --- a/WAPT/control +++ b/WAPT/control @@ -1,5 +1,5 @@ package : fws-remove-crapwares -version : 1 +version : 2 architecture : all section : base priority : normal diff --git a/setup.py b/setup.py index 647860a..c914f09 100644 --- a/setup.py +++ b/setup.py @@ -16,19 +16,7 @@ uninstallkey = [] crapwares = [ 're:ask toolbar', - ('key:{7DB9F1E5-9ACB-410D-A7DC-7A3D023CE045}','welcome.exe','Dell Getting Started Guide'), - 'key:MozillaMaintenanceService', - 'metro:Microsoft.XboxGameCallableUI', - 'metro:Microsoft.MSPaint', - 'metro:Microsoft.SkypeApp', - 'metro:Microsoft.XboxGameOverlay', - 'metro:Microsoft.Whiteboard', - 'metro:Microsoft.Microsoft3DViewer', - 'metro:Microsoft.XboxIdentityProvider', - 'metro:Microsoft.MicrosoftStickyNotes', - 'metro:Microsoft.ZuneMusic', - 'metro:Microsoft.WindowsMaps', - 'metro:Microsoft.WindowsMaps' + ('key:{7DB9F1E5-9ACB-410D-A7DC-7A3D023CE045}','welcome.exe','Dell Getting Started Guide') ] def find_soft_re(softs,pattern): @@ -61,11 +49,8 @@ def install(): title = crapware run = None - # metro app must be removed with powershell - if isinstance(crapware,(unicode,str)) and crapware.startswith('metro:') and windows_version() > Version('10'): - print('Removing %s (metro app)' % crapware[6:]) - run_powershell(r'Get-AppxPackage -AllUsers | where-object {$_.name -like "%s"} | Remove-AppxPackage' % crapware[6:]) - elif isinstance(crapware,re._pattern_type): + + if isinstance(crapware,re._pattern_type): uninstall_entries = find_soft_re(all_softs,crapware) elif isinstance(crapware,(unicode,str)) and crapware.startswith('re:'): uninstall_entries = find_soft_re(all_softs,re.compile(crapware[3:],re.IGNORECASE))