From 059201e9cf95fcaab615751b61020b9925506a72 Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Fri, 17 Feb 2023 11:55:36 +0100
Subject: [PATCH] permissions bugfix

---
 image/CopyTools.cmd | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/image/CopyTools.cmd b/image/CopyTools.cmd
index 3cd1ded..3f91d1b 100644
--- a/image/CopyTools.cmd
+++ b/image/CopyTools.cmd
@@ -8,16 +8,25 @@ set SCRIPTS=%TOOLS%\scripts
 echo ####### %0 #######
 
 echo killing ssh agent ...
-taskkill /F /IM ssh-agent.exe
-taskkill /F /IM ssh.exe
+taskkill /F /IM ssh-agent.exe 2>nul
+taskkill /F /IM ssh.exe 2>nul
 echo.
 
 echo killing WinAuth ...
-taskkill /F /IM WinAuth.exe
+taskkill /F /IM WinAuth.exe 2>nul
+echo.
+
+echo installing permissions script ...
+copy /Y tools\scripts\set-permissions.cmd %SystemDrive%
+takeown /F %SystemDrive%\set-permissions.cmd /A
+icacls %SystemDrive%\set-permissions.cmd /inheritance:r
+icacls %SystemDrive%\set-permissions.cmd /grant Administrators:F
+icacls %SystemDrive%\set-permissions.cmd /grant Users:RX
 echo.
 
 echo deleting %TOOLS% ...
-rd /S /Q %TOOLS%
+takeown /F %TOOLS% /R /D Y 1>nul
+rd /S /Q %TOOLS% 2>nul
 echo.
 
 echo copying folder %TOOLS% ...
@@ -51,21 +60,18 @@ echo.
 call install-git.cmd
 echo.
 
-move /Y %SCRIPTS%\set-permissions.cmd C:\
-takeown /F %SystemDrive%\set-permissions.cmd /A
-icacls %SystemDrive%\set-permissions.cmd /inheritance:r
-icacls %SystemDrive%\set-permissions.cmd /grant Administrators:F
-icacls %SystemDrive%\set-permissions.cmd /grant Users:RX
+rem remove duplicate permissions script ...
+del /F /Q set-permissions.cmd
 
 rem set ALL permissions ...
-call %SystemDrive%\set-permissions.cmd
-echo.
-
-echo ####### %0 #######
-echo READY.
+cd /D %SystemDrive%\
+call set-permissions.cmd
 echo.
 
 echo cd to %T% ...
 cd /D %T%
 echo.
 
+echo ####### %0 #######
+echo READY.
+echo.