From 1a89bb1ebceda714eb1890ad6ff56c06447ba9f8 Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Mon, 20 Feb 2023 09:24:42 +0100
Subject: [PATCH] hardcoding removsal

---
 scripts/cleanup-tiles.cmd           | 3 +--
 scripts/copy-executables.cmd        | 2 +-
 scripts/disable-networkfeatures.cmd | 3 +--
 scripts/enable-updates.cmd          | 2 +-
 scripts/install-git.cmd             | 2 +-
 scripts/install-logonscript.cmd     | 2 +-
 scripts/modify-desktoptheme.cmd     | 2 +-
 scripts/modify-path.cmd             | 2 +-
 scripts/set-filetypes.cmd           | 2 +-
 scripts/set-permissions.cmd         | 2 +-
 scripts/unpack-7zip.cmd             | 3 ++-
 scripts/unpack-pspackages.cmd       | 2 +-
 scripts/unpack-vnc.cmd              | 3 ++-
 scripts/unpack-zipfiles.cmd         | 4 ++--
 14 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/scripts/cleanup-tiles.cmd b/scripts/cleanup-tiles.cmd
index 8ae302b..eb15bb6 100644
--- a/scripts/cleanup-tiles.cmd
+++ b/scripts/cleanup-tiles.cmd
@@ -1,10 +1,9 @@
 @echo off
-set TOOLS=c:\tools
 
 echo ####### %0 #######
 
 echo Cleaning up tiles in the START menu ...
-powershell -command %TOOLS%\scripts\cleanup-tiles.ps1
+powershell -command .\cleanup-tiles.ps1
 
 echo ####### %0 #######
 
diff --git a/scripts/copy-executables.cmd b/scripts/copy-executables.cmd
index 3e2e9bb..71a4eea 100644
--- a/scripts/copy-executables.cmd
+++ b/scripts/copy-executables.cmd
@@ -1,6 +1,6 @@
 @echo off
 
-set TOOLS=c:\tools
+set TOOLS=%SystemDrive%\tools
 set SOFTWARE=..\software
 set COMPANY=..\company
 
diff --git a/scripts/disable-networkfeatures.cmd b/scripts/disable-networkfeatures.cmd
index 943683a..e15e814 100644
--- a/scripts/disable-networkfeatures.cmd
+++ b/scripts/disable-networkfeatures.cmd
@@ -1,10 +1,9 @@
 @echo off
-set TOOLS=c:\tools
 
 echo ####### %0 #######
 
 echo Disabling unwanted NETWORK features ...
-powershell -command %TOOLS%\scripts\disable-networkfeatures.ps1
+powershell -command .\disable-networkfeatures.ps1
 
 echo ####### %0 #######
 
diff --git a/scripts/enable-updates.cmd b/scripts/enable-updates.cmd
index 09465fe..42582d3 100644
--- a/scripts/enable-updates.cmd
+++ b/scripts/enable-updates.cmd
@@ -1,5 +1,5 @@
 @echo off
-set TOOLS=c:\tools
+set TOOLS=%SystemDrive%\tools
 
 echo ####### %0 #######
 
diff --git a/scripts/install-git.cmd b/scripts/install-git.cmd
index 4e6e046..b91df12 100644
--- a/scripts/install-git.cmd
+++ b/scripts/install-git.cmd
@@ -1,7 +1,7 @@
 @echo off
 
 set CONFIG=config\install-git.txt
-set TOOLS=c:\tools
+set TOOLS=%SystemDrive%\tools
 set EXE=..\software\git-setup.exe
 
 if NOT EXIST %EXE% (
diff --git a/scripts/install-logonscript.cmd b/scripts/install-logonscript.cmd
index ff5d2cf..a396a34 100644
--- a/scripts/install-logonscript.cmd
+++ b/scripts/install-logonscript.cmd
@@ -1,5 +1,5 @@
 @echo off
-set TOOLS=c:\tools
+set TOOLS=%SystemDrive%\tools
 set TARGET="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Startup"
 
 echo ####### %0 #######
diff --git a/scripts/modify-desktoptheme.cmd b/scripts/modify-desktoptheme.cmd
index 8fa3e34..4b81668 100644
--- a/scripts/modify-desktoptheme.cmd
+++ b/scripts/modify-desktoptheme.cmd
@@ -2,7 +2,7 @@
 set TOOLS=c:\tools
 
 set CONFIG=%TOOLS%\scripts\config
-set THEMES=C:\Windows\Resources\Themes
+set THEMES=%windir%\Resources\Themes
 
 echo ####### %0 #######
 
diff --git a/scripts/modify-path.cmd b/scripts/modify-path.cmd
index fcc8884..73af3b3 100644
--- a/scripts/modify-path.cmd
+++ b/scripts/modify-path.cmd
@@ -1,5 +1,5 @@
 @echo off
-set TOOLS=c:\tools
+set TOOLS=%SystemDrive%\tools
 
 set newPATH=%SYSTEMROOT%;%SYSTEMROOT%\system32;^
 %SYSTEMROOT%\system32\wbem;^
diff --git a/scripts/set-filetypes.cmd b/scripts/set-filetypes.cmd
index d05e754..84bb5de 100644
--- a/scripts/set-filetypes.cmd
+++ b/scripts/set-filetypes.cmd
@@ -1,6 +1,6 @@
 @echo off
 
-set %TOOLS%=c:\tools
+set %TOOLS%=%SystemDrive%\tools
 set ARG1=null
 
 IF "%~1" NEQ "" set ARG1=%1
diff --git a/scripts/set-permissions.cmd b/scripts/set-permissions.cmd
index 9562a14..e3701c4 100644
--- a/scripts/set-permissions.cmd
+++ b/scripts/set-permissions.cmd
@@ -1,6 +1,6 @@
 @echo off
 
-set TOOLS=c:\tools
+set TOOLS=%SystemDrive%\tools
 
 echo ####### %0 #######
 
diff --git a/scripts/unpack-7zip.cmd b/scripts/unpack-7zip.cmd
index 4e6286f..d62667b 100644
--- a/scripts/unpack-7zip.cmd
+++ b/scripts/unpack-7zip.cmd
@@ -2,7 +2,8 @@
 
 set SCRIPTS=..\scripts
 set SOFTWARE=..\software
-set T=c:\TEMP
+set T=%SystemDrive%\TEMP
+set TOOLS=%SystemDrive%\tools
 set MSI=7z-setup.msi
 
 if NOT EXIST %SOFTWARE%\%MSI% (
diff --git a/scripts/unpack-pspackages.cmd b/scripts/unpack-pspackages.cmd
index 8037cde..5b3d867 100644
--- a/scripts/unpack-pspackages.cmd
+++ b/scripts/unpack-pspackages.cmd
@@ -1,6 +1,6 @@
 @echo off
 
-set TOOLS=c:\tools
+set TOOLS=%SystemDrive%\tools
 set SOFTWARE=..\software
 set TARGET="%ProgramFiles%\WindowsPowerShell\Modules"
 
diff --git a/scripts/unpack-vnc.cmd b/scripts/unpack-vnc.cmd
index e457c34..9e708bd 100644
--- a/scripts/unpack-vnc.cmd
+++ b/scripts/unpack-vnc.cmd
@@ -2,7 +2,8 @@
 
 set SCRIPTS=..\scripts
 set SOFTWARE=..\software
-set T=c:\TEMP
+set T=%SystemDrive%\TEMP
+set TOOLS=%SystemDrive%\tools
 set MSI=vnc-setup.msi
 
 if NOT EXIST %SOFTWARE%\%MSI% (
diff --git a/scripts/unpack-zipfiles.cmd b/scripts/unpack-zipfiles.cmd
index 5fadfa3..2632a62 100644
--- a/scripts/unpack-zipfiles.cmd
+++ b/scripts/unpack-zipfiles.cmd
@@ -1,8 +1,8 @@
 @echo off
 
-set TOOLS=c:\tools
+set T=%SystemDrive%\TEMP
+set TOOLS=%SystemDrive%\tools
 set SOFTWARE=..\software
-set T=c:\TEMP
 
 echo ####### %0 #######