From c4a78a3e245679e15f55394b82a205c08b94c249 Mon Sep 17 00:00:00 2001
From: zeffy <zeffy@users.noreply.github.com>
Date: Tue, 13 Jun 2017 04:08:22 -0700
Subject: [PATCH] improve batch script installers

- remove annoying confirmations on disable/enable scripts
- fix disable script on x86
- make sure Schedule service is running before trying do anything with
schtasks
---
 install/install_wufuc.bat                 |  1 +
 install/uninstall_wufuc.bat               |  1 +
 install/utility scripts/disable_wufuc.bat | 17 +++--------------
 install/utility scripts/enable_wufuc.bat  | 14 ++------------
 4 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/install/install_wufuc.bat b/install/install_wufuc.bat
index 730ef8a..6fd8ae0 100644
--- a/install/install_wufuc.bat
+++ b/install/install_wufuc.bat
@@ -109,6 +109,7 @@ echo.
 
 :install
 set "wufuc_task=wufuc.{72EEE38B-9997-42BD-85D3-2DD96DA17307}"
+net start Schedule
 schtasks /Create /XML "%~dp0wufuc.xml" /TN "%wufuc_task%" /F
 schtasks /Change /TN "%wufuc_task%" /TR "'%systemroot%\system32\rundll32.exe' """%wufuc_dll%""",Rundll32Entry"
 schtasks /Change /TN "%wufuc_task%" /ENABLE
diff --git a/install/uninstall_wufuc.bat b/install/uninstall_wufuc.bat
index ca92e0c..518d846 100644
--- a/install/uninstall_wufuc.bat
+++ b/install/uninstall_wufuc.bat
@@ -55,6 +55,7 @@ echo.
 
 set "wufuc_task=wufuc.{72EEE38B-9997-42BD-85D3-2DD96DA17307}"
 rundll32 "%wufuc_dll%",Rundll32Unload
+net start Schedule
 schtasks /Delete /TN "%wufuc_task%" /F
 
 echo.
diff --git a/install/utility scripts/disable_wufuc.bat b/install/utility scripts/disable_wufuc.bat
index 9d9cdcf..7321a72 100644
--- a/install/utility scripts/disable_wufuc.bat	
+++ b/install/utility scripts/disable_wufuc.bat	
@@ -35,7 +35,7 @@ if /I "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
     )
     if /I "%PROCESSOR_ARCHITECTURE%"=="x86" (
         set "WINDOWS_ARCHITECTURE=x86"
-        set "wufuc_dll=%~dp0wufuc32.dll"
+        set "wufuc_dll=%~dp0..\wufuc32.dll"
         goto :confirmation
     )
 )
@@ -45,13 +45,9 @@ goto :die
 set "WINDOWS_ARCHITECTURE=x64"
 set "wufuc_dll=%~dp0..\wufuc64.dll"
 
-:confirmation
-set /p CONTINUE=Enter 'Y' if you want to disable wufuc: 
-if /I not "%CONTINUE%"=="Y" goto :cancel
-echo.
-
 set "wufuc_task=wufuc.{72EEE38B-9997-42BD-85D3-2DD96DA17307}"
 rundll32 "%wufuc_dll%",Rundll32Unload
+net start Schedule
 schtasks /Change /TN "%wufuc_task%" /DISABLE
 
 echo.
@@ -59,12 +55,5 @@ echo Disabled wufuc! You will still be able to check for updates until you resta
 
 :die
 echo.
-echo Press any key to exit...
-pause >nul
-exit
-
-:cancel
-echo.
-echo Canceled by user, press any key to exit...
-pause >nul
+pause
 exit
diff --git a/install/utility scripts/enable_wufuc.bat b/install/utility scripts/enable_wufuc.bat
index 8c682ba..4b2e1c6 100644
--- a/install/utility scripts/enable_wufuc.bat	
+++ b/install/utility scripts/enable_wufuc.bat	
@@ -27,11 +27,8 @@ fltmc >nul 2>&1 || (
     goto :die
 )
 
-set /p CONTINUE=Enter 'Y' if you want to enable wufuc: 
-if /I not "%CONTINUE%"=="Y" goto :cancel
-echo.
-
 set "wufuc_task=wufuc.{72EEE38B-9997-42BD-85D3-2DD96DA17307}"
+net start Schedule
 schtasks /Change /TN "%wufuc_task%" /ENABLE
 schtasks /Run /TN "%wufuc_task%"
 
@@ -40,12 +37,5 @@ echo Enabled and started wufuc!
 
 :die
 echo.
-echo Press any key to exit...
-pause >nul
-exit
-
-:cancel
-echo.
-echo Canceled by user, press any key to exit...
-pause >nul
+pause
 exit