From adcb4d086f2bde477892eb5db3e30227274d0fd2 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Mon, 16 Apr 2018 02:30:23 +0200
Subject: [PATCH] Revert "Windows command scripts cleanup/ via @B00ze64"

This reverts commit db837204dadf1d3ddb210ca049df708c0b5a594b.

@ingber: "2.0.9 works fine on my x64 Ubuntu VPS, but fails as did yours on Windows x64.
Your [@iWARR] solution on Windows works fine."

@iWARR: "I want to note, that *.bat file from v2.0.8 is able provide successfully
installation for the v2.0.9 pack, as usual. Other *.bat files from v2.0.8 are fine also."
---
 windows/service-install.bat   | 20 +++++++++++---------
 windows/service-restart.bat   | 32 +++++++++++---------------------
 windows/service-uninstall.bat | 20 +++++++++++---------
 3 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/windows/service-install.bat b/windows/service-install.bat
index b593c02d..6a66b18c 100755
--- a/windows/service-install.bat
+++ b/windows/service-install.bat
@@ -1,21 +1,23 @@
-@ECHO OFF & SETLOCAL ENABLEEXTENSIONS
+@ECHO OFF
 
-CD /d %~dp0
-SFC 2>&1 | FIND /i "/SCANNOW" >NUL:
-IF ERRORLEVEL 1 GOTO :ELEVATE
-GOTO :ADMINTASKS
+SFC 2>&1 | FIND /i "/SCANNOW" >NUL
+IF %ERRORLEVEL% NEQ 0 GOTO ELEVATE
+GOTO ADMINTASKS
 
 :ELEVATE
-
 ECHO Elevated privileges are temporarily required, just to register or remove the dnscrypt-proxy service
+CD /d %~dp0
 MSHTA "javascript: var shell = new ActiveXObject('shell.application'); shell.ShellExecute('%~nx0', '', '', 'runas', 1); close();"
 EXIT
 
 :ADMINTASKS
 
-dnscrypt-proxy.exe -service install
-dnscrypt-proxy.exe -service start
+CD /d %~dp0
 
-ECHO.
+CMD.EXE /c "dnscrypt-proxy.exe -service install"
+CMD.EXE /c "dnscrypt-proxy.exe -service start"
+
+ECHO ""
 SET /P _=Thank you for using dnscrypt-proxy! Hit [RETURN] to finish
+
 EXIT
diff --git a/windows/service-restart.bat b/windows/service-restart.bat
index 32e8bd24..978abaab 100755
--- a/windows/service-restart.bat
+++ b/windows/service-restart.bat
@@ -1,33 +1,23 @@
-@ECHO OFF & SETLOCAL ENABLEEXTENSIONS
+@ECHO OFF
 
-CD /d %~dp0
-SFC 2>&1 | FIND /i "/SCANNOW" >NUL:
-IF ERRORLEVEL 1 GOTO :ELEVATE
-GOTO :ADMINTASKS
+SFC 2>&1 | FIND /i "/SCANNOW" >NUL
+IF %ERRORLEVEL% NEQ 0 GOTO ELEVATE
+GOTO ADMINTASKS
 
 :ELEVATE
-
-ECHO Elevated privileges are temporarily required, just to register or remove the dnscrypt-proxy service.
+ECHO Elevated privileges are temporarily required, just to register or remove the dnscrypt-proxy service
+CD /d %~dp0
 MSHTA "javascript: var shell = new ActiveXObject('shell.application'); shell.ShellExecute('%~nx0', '', '', 'runas', 1); close();"
 EXIT
 
 :ADMINTASKS
 
-REM If DNSCrypt-Proxy is not yet running restart will fail
-Tasklist /FI "IMAGENAME eq dnscrypt-proxy.exe" /NH | Find "dnscrypt-proxy.exe" >NUL:
-IF ERRORLEVEL 1 GOTO :SVCSTART
+CD /d %~dp0
 
-ECHO Re-Starting Service...
-dnscrypt-proxy.exe -service restart
-GOTO :SAYTHANKS
+CMD.EXE /c "dnscrypt-proxy.exe -service stop"
+CMD.EXE /c "dnscrypt-proxy.exe -service start"
 
-:SVCSTART
-
-ECHO Starting Service...
-dnscrypt-proxy.exe -service start
-
-:SAYTHANKS
-
-ECHO.
+ECHO ""
 SET /P _=Thank you for using dnscrypt-proxy! Hit [RETURN] to finish
+
 EXIT
diff --git a/windows/service-uninstall.bat b/windows/service-uninstall.bat
index c7b4539d..b1772783 100755
--- a/windows/service-uninstall.bat
+++ b/windows/service-uninstall.bat
@@ -1,21 +1,23 @@
-@ECHO OFF & SETLOCAL ENABLEEXTENSIONS
+@ECHO OFF
 
-CD /d %~dp0
-SFC 2>&1 | FIND /i "/SCANNOW" >NUL:
-IF ERRORLEVEL 1 GOTO :ELEVATE
-GOTO :ADMINTASKS
+SFC 2>&1 | FIND /i "/SCANNOW" >NUL
+IF %ERRORLEVEL% NEQ 0 GOTO ELEVATE
+GOTO ADMINTASKS
 
 :ELEVATE
-
 ECHO Elevated privileges are temporarily required, just to register or remove the dnscrypt-proxy service
+CD /d %~dp0
 MSHTA "javascript: var shell = new ActiveXObject('shell.application'); shell.ShellExecute('%~nx0', '', '', 'runas', 1); close();"
 EXIT
 
 :ADMINTASKS
 
-dnscrypt-proxy.exe -service stop
-dnscrypt-proxy.exe -service uninstall
+CD /d %~dp0
 
-ECHO.
+CMD.EXE /c ".\dnscrypt-proxy.exe -service stop"
+CMD.EXE /c ".\dnscrypt-proxy.exe -service uninstall"
+
+ECHO ""
 SET /P _=Thank you for using dnscrypt-proxy! Hit [RETURN] to finish
+
 EXIT