Add files via upload

resources/stage_4_repair/disable_windows_telemetry/ooshutup10_tron_settings.cfg

@@ -12,7 +12,7 @@
 # get any feedback about the import.
 #
 # We are always happy to answer any questions you may have!
-# (c) 2015-2018 O&O Software GmbH, Berlin. https://www.oo-software.com/
+# Copyright © O&O Software GmbH https://www.oo-software.com/
 ############################################################################
 
 P001	+
@@ -26,22 +26,26 @@ P017	+
 P026	+
 P027	+
 P028	+
-P009	-
+P009	+
 P010	+
 P015	+
 P016	+
 P007	+
-P025	+
+P025	-
 P023	+
 P012	+
-P013	-
+P013	+
 P019	+
 P020	+
 P011	+
 P018	+
 P021	+
 P022	+
 P014	+
+P029	+
+P030	+
+P031	+
+P032	+
 P024	-
 S001	+
 S002	+
@@ -54,7 +58,10 @@ S010	+
 E001	+
 E002	+
 E003	+
+E008	+
 E007	+
+E010	+
+E009	+
 E004	+
 E005	+
 E006	+
@@ -65,7 +72,7 @@ Y004	+
 Y005	+
 Y006	+
 Y007	+
-C001	+
+C012	+
 C002	+
 C004	+
 C005	+
@@ -94,27 +101,29 @@ W011	+
 W004	+
 W005	-
 W010	+
-W009	+
+W009	-
 W006	-
 W007	-
 W008	-
 M006	+
-M011	-
+M011	+
 M010	+
 O003	+
-O001	-
+O001	+
 S012	+
 S013	+
 S014	+
 S011	-
 K001	+
 K002	+
+K005	+
 M001	+
 M002	+
 M003	+
 M004	+
 M005	+
 M012	-
-M013	-
+M013	+
 M014	+
-N001	-
+M015	+
+N001	+

resources/stage_4_repair/disable_windows_telemetry/purge_windows_10_telemetry.bat

@@ -6,7 +6,8 @@
 ::                  - win10-unfu**k: https://github.com/dfkt/win10-unfuck
 ::                  - WindowsLies:   https://github.com/WindowsLies/BlockWindows
 ::                  - ... and many other places around the web
-:: Version:       1.2.6-TRON ! Fix standalone execution not working in some sections due to relative paths being different. Thanks to u/AncientAv
+:: Version:       1.2.7-TRON ! Fix standalone and Tron-called execution due to typo in STANDALONE variable comparison command. Thanks to u/bubonis
+::                1.2.6-TRON ! Fix standalone execution not working in some sections due to relative paths being different. Thanks to u/AncientAv
 ::                1.2.5-TRON + Add disabling of "Occasionally show suggestions in Start"
 ::                1.2.4-TRON ! Fix standalone execution broken due to use of uninitialized %REG% variable
 ::                1.2.3-TRON * Use %REG% instead of relative calls
@@ -42,8 +43,8 @@ SETLOCAL
 :: PREP AND CHECKS ::
 :::::::::::::::::::::
 @echo off
-set SCRIPT_VERSION=1.2.6-TRON
-set SCRIPT_UPDATED=2018-08-15
+set SCRIPT_VERSION=1.2.7-TRON
+set SCRIPT_UPDATED=2018-11-19
 
 :: Populate dependent variables if we didn't inherit them from Tron (standalone execution)
 set STANDALONE=no
@@ -54,7 +55,7 @@ if /i "%LOGPATH%"=="" (
 	set REG=%SystemRoot%\System32\reg.exe
 )
 if /i "%LOGPATH%"=="" (
-	set LOGPATH=%SystemDrive%\Logs
+	set LOGPATH=%SystemDrive%\logs
 	set LOGFILE=windows_10_telemetry_removal.log
 	set VERBOSE=no
 	set STANDALONE=yes
@@ -90,7 +91,7 @@ if /i not "%WIN_VER:~0,9%"=="Windows 1" (
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 :: REMOVE BAD UPDATES
-if STANDALONE==no (
+if %STANDALONE%==no (
 	call functions\log.bat "     Uninstalling bad updates, please wait..."
 ) else (
 	echo "Uninstalling bad updates, please wait..."
@@ -190,37 +191,37 @@ if "%VERBOSE%"=="yes" (
 	start /wait "" wusa /uninstall /kb:3068707 /norestart /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
 )
 
-if STANDALONE==no (call functions\log.bat "     Done.") else (echo "Done.")
+if %STANDALONE%==no (call functions\log.bat "     Done.") else (echo "Done.")
 
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 :: BLOCK BAD UPDATES
-if STANDALONE==no (
+if %STANDALONE%==no (
 	call functions\log.bat "     Blocking bad updates, please wait..."
 ) else (
 	echo "Blocking bad updates, please wait..."
 )
 echo.
 
+
 :: This line needed if we're being called from Tron. In standalone mode we'll already be in the appropriate directory
-if STANDALONE==no pushd stage_4_repair\disable_windows_telemetry >nul 2>&1
+if %STANDALONE%==no pushd stage_4_repair\disable_windows_telemetry >nul 2>&1
 
 :: Batch 1
 start "" /b /wait cscript.exe ".\block_windows_updates.vbs" 3080149 3075853 3075851 3075249 3068708 3068707 3065987 3050267 3050265 3044374 3035583 3022345 
 
 :: Batch 2
 start "" /b /wait cscript.exe ".\block_windows_updates.vbs" 3021917 3015249 3014460 3012973 2990214 2977759 2976987 2976978 2952664 2922324 2902907
 
-if STANDALONE==no popd
-
+if %STANDALONE%==no popd
 
-if STANDALONE==no (call functions\log.bat "     Done.") else (echo "Done.")
+if %STANDALONE%==no (call functions\log.bat "     Done.") else (echo "Done.")
 
 
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 :: SCHEDULED TASKS
-if STANDALONE==no (
+if %STANDALONE%==no (
 	call functions\log.bat "     Removing telemetry-related scheduled tasks..."
 ) else (
 	echo "Removing telemetry-related scheduled tasks...."
@@ -307,13 +308,13 @@ if "%VERBOSE%"=="yes" (
 	schtasks /delete /f /tn "\Microsoft\Windows\media center\updaterecordpath" >> "%LOGPATH%\%LOGFILE%" 2>&1
 )
 
-if STANDALONE==no (call functions\log.bat "     Done.") else (echo "Done.")
+if %STANDALONE%==no (call functions\log.bat "     Done.") else (echo "Done.")
 
 
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 :: SERVICES
-if STANDALONE==no (
+if %STANDALONE%==no (
 	call functions\log.bat "     Removing bad services, please wait..."
 ) else (
 	echo "Removing bad services, please wait..."
@@ -385,12 +386,12 @@ if "%VERBOSE%"=="yes" (
 	sc config xbgm start= disabled>> "%LOGPATH%\%LOGFILE%" 2>&1
 )
 
-if STANDALONE==no (call functions\log.bat "     Done.") else (echo "Done.")
+if %STANDALONE%==no (call functions\log.bat "     Done.") else (echo "Done.")
 
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 :: REGISTRY ENTRIES
-if STANDALONE==no (
+if %STANDALONE%==no (
 	call functions\log.bat "     Toggling official MS telemetry registry entries..."
 ) else (
 	echo "Toggling official MS telemetry registry entries..."
@@ -473,39 +474,39 @@ if "%VERBOSE%"=="yes" (
 
 )
 
-if STANDALONE==no (call functions\log.bat "     Done.") else (echo "Done.")
+if %STANDALONE%==no (call functions\log.bat "     Done.") else (echo "Done.")
 
 
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 :: SPYBOT ANTI-BEACON IMMUNIZATIONS
-if STANDALONE==no (
+if %STANDALONE%==no (
 	call functions\log.bat "     Applying Spybot Anti-Beacon protections, please wait..."
 	"stage_4_repair\disable_windows_telemetry\Spybot Anti-Beacon v1.6.0.42.exe" /apply /silent >> "%LOGPATH%\%LOGFILE%" 2>&1
 ) else (
 	echo "Applying Spybot Anti-Beacon protections, please wait..."
 	"Spybot Anti-Beacon v1.6.0.42.exe" /apply /silent >> "%LOGPATH%\%LOGFILE%" 2>&1
 )	
-if STANDALONE==no (call functions\log.bat "     Done.") else (echo "Done.")
+if %STANDALONE%==no (call functions\log.bat "     Done.") else (echo "Done.")
 
 
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 :: OandOShutUp10 IMMUNIZATIONS
-if STANDALONE==no (
+if %STANDALONE%==no (
 	call functions\log.bat "     Applying OandOShutUp10 protections, please wait..."
 	stage_4_repair\disable_windows_telemetry\OOShutUp10.exe stage_4_repair\disable_windows_telemetry\ooshutup10_tron_settings.cfg /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
 ) else (
 	echo "Applying OandOShutUp10 protections, please wait..."
 	OOShutUp10.exe .\ooshutup10_tron_settings.cfg /quiet >> "%LOGPATH%\%LOGFILE%" 2>&1
 )
-if STANDALONE==no (call functions\log.bat "     Done.") else (echo "Done.")
+if %STANDALONE%==no (call functions\log.bat "     Done.") else (echo "Done.")
 
 
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 :: NULL ROUTE BAD HOSTS
-if STANDALONE==no (
+if %STANDALONE%==no (
 	call functions\log.bat "     Null-routing bad hosts, please wait..."
 ) else (
 	echo "Null-routing bad hosts, please wait..."
@@ -730,13 +731,13 @@ if "%VERBOSE%"=="yes" (
 	route -p add 65.52.100.93/32 0.0.0.0 >> "%LOGPATH%\%LOGFILE%" 2>&1
 )
 
-if STANDALONE==no (call functions\log.bat "     Done.") else (echo "Done.")
+if %STANDALONE%==no (call functions\log.bat "     Done.") else (echo "Done.")
 
 
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 :: MISCELLANEOUS
-if STANDALONE==no (
+if %STANDALONE%==no (
 	call functions\log.bat "     Miscellaneous cleanup, please wait..."
 ) else (
 	echo "Miscellaneous cleanup, please wait..."
@@ -745,7 +746,7 @@ if STANDALONE==no (
 :: Kill GWX/Skydrive/Spynet/Telemetry/waitifisense/etc
 if "%VERBOSE%"=="yes" (
 	taskkill /f /im gwx.exe /t
-	if STANDALONE==no (
+	if %STANDALONE%==no (
 		stage_4_repair\disable_windows_telemetry\setacl.exe -on "hkey_local_machine\software\microsoft\wcmsvc\wifinetworkmanager" -ot reg -actn setowner -ownr n:administrators
 		stage_4_repair\disable_windows_telemetry\setacl.exe -on "hkey_local_machine\software\microsoft\wcmsvc\wifinetworkmanager" -ot reg -actn ace -ace "n:administrators;p:full"
 		stage_4_repair\disable_windows_telemetry\setacl.exe -on "hkey_local_machine\software\microsoft\windows\currentversion\windowsupdate\auto update" -ot reg -actn setowner -ownr n:administrators
@@ -774,7 +775,7 @@ if "%VERBOSE%"=="yes" (
 	)
 ) else (
 	taskkill /f /im gwx.exe /t >> "%LOGPATH%\%LOGFILE%" 2>&1
-	if STANDALONE==no (
+	if %STANDALONE%==no (
 		stage_4_repair\disable_windows_telemetry\setacl.exe -on "hkey_local_machine\software\microsoft\wcmsvc\wifinetworkmanager" -ot reg -actn setowner -ownr n:administrators >> "%LOGPATH%\%LOGFILE%" 2>&1
 		stage_4_repair\disable_windows_telemetry\setacl.exe -on "hkey_local_machine\software\microsoft\wcmsvc\wifinetworkmanager" -ot reg -actn ace -ace "n:administrators;p:full" >> "%LOGPATH%\%LOGFILE%" 2>&1
 		stage_4_repair\disable_windows_telemetry\setacl.exe -on "hkey_local_machine\software\microsoft\windows\currentversion\windowsupdate\auto update" -ot reg -actn setowner -ownr n:administrators >> "%LOGPATH%\%LOGFILE%" 2>&1
@@ -818,4 +819,4 @@ echo y|cacls.exe "%programdata%\Microsoft\Diagnosis\ETLLogs\AutoLogger\AutoLogge
 %REG% ADD HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\CloudContent /v DisableWindowsConsumerFeatures /t REG_DWORD /d 1 /f
 
 
-if STANDALONE==no (call functions\log.bat "     Done.") else (echo "Done.")
+if %STANDALONE%==no (call functions\log.bat "     Done.") else (echo "Done.")