From 3f650d2f5e1dbf4d54ddc6b9e1ec31e854683e98 Mon Sep 17 00:00:00 2001
From: camoy <camo@m3l.net>
Date: Thu, 15 Aug 2024 16:46:27 -0700
Subject: [PATCH] Path and code minor changes

---
 scripts/ps/download.ps1  | 16 ++++++++--------
 scripts/ps/makerespt.ps1 |  2 +-
 scripts/ps/netcheck.ps1  |  1 -
 scripts/ps/syscheck.ps1  |  2 +-
 scripts/ps/uninstall.ps1 |  2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/scripts/ps/download.ps1 b/scripts/ps/download.ps1
index 23529df..cf94abc 100644
--- a/scripts/ps/download.ps1
+++ b/scripts/ps/download.ps1
@@ -1,18 +1,18 @@
 Write-Host "---Download Wget---"
 Invoke-WebRequest "https://eternallybored.org/misc/wget/1.21.4/64/wget.exe" -OutFile "C:\sc\tools\wget\wget.exe"
 Write-Host "---Download 7-Zip---"
-C:\sctools\wget\wget.exe -O "C:\sc\tools\7zip\7zr.exe" "https://7-zip.org/a/7zr.exe"
+C:\sc\tools\wget\wget.exe -O "C:\sc\tools\7zip\7zr.exe" "https://7-zip.org/a/7zr.exe"
 Write-Host "---Download git---"
-C:\sctools\wget\wget.exe -O "C:\sc\tools\git\PortableGit.7z.exe" "https://github.com/git-for-windows/git/releases/download/v2.45.2.windows.1/PortableGit-2.45.2-64-bit.7z.exe"
+C:\sc\tools\wget\wget.exe -O "C:\sc\tools\git\PortableGit.7z.exe" "https://github.com/git-for-windows/git/releases/download/v2.45.2.windows.1/PortableGit-2.45.2-64-bit.7z.exe"
 Write-Host "---Download Custom Resolution Utility---"
-C:\sctools\wget\wget.exe -O "C:\sc\tools\cru\customresolutionutility.zip" "https://customresolutionutility.b-cdn.net/cru-1.5.2.zip"
+C:\sc\tools\wget\wget.exe -O "C:\sc\tools\cru\customresolutionutility.zip" "https://customresolutionutility.b-cdn.net/cru-1.5.2.zip"
 Write-Host "---Download AntimicroX---"
-C:\sctools\wget\wget.exe -O "C:\sc\tools\antimicrox\antimicrox-portable.zip" "https://github.com/AntiMicroX/antimicrox/releases/download/3.4.0/antimicrox-3.4.0-PortableWindows-AMD64.zip"
+C:\sc\tools\wget\wget.exe -O "C:\sc\tools\antimicrox\antimicrox-portable.zip" "https://github.com/AntiMicroX/antimicrox/releases/download/3.4.0/antimicrox-3.4.0-PortableWindows-AMD64.zip"
 Write-Host "---Download Attract-Mode---"
-C:\sctools\wget\wget.exe -O "C:\sc\tools\attractmode\attract.zip" "https://github.com/mickelson/attract/releases/download/v2.7.0/attract-v2.7.0-win64.zip"
+C:\sc\tools\wget\wget.exe -O "C:\sc\tools\attractmode\attract.zip" "https://github.com/mickelson/attract/releases/download/v2.7.0/attract-v2.7.0-win64.zip"
 Write-Host "---Download FastIO2KB---"
-C:\sctools\wget\wget.exe -O "C:\sc\tools\fastio2kb\fastio2kb.zip" "https://github.com/JoeHowse/FastIO2KB/releases/download/2021.04.04_Easter/FastIO2KB_2021.04.04_Easter.zip"
+C:\sc\tools\wget\wget.exe -O "C:\sc\tools\fastio2kb\fastio2kb.zip" "https://github.com/JoeHowse/FastIO2KB/releases/download/2021.04.04_Easter/FastIO2KB_2021.04.04_Easter.zip"
 Write-Host "---Download AutoHotKey---"
-C:\sctools\wget\wget.exe -O "C:\sc\tools\ahk\ahk-v2.exe" "https://www.autohotkey.com/download/ahk-v2.exe"
+C:\sc\tools\wget\wget.exe -O "C:\sc\tools\ahk\ahk-v2.exe" "https://www.autohotkey.com/download/ahk-v2.exe"
 Write-Host "---Download I-PAC---"
-C:\sctools\wget\wget.exe -O "C:\sc\tools\ipac\winipacv2setup.exe" "https://www.ultimarc.com/winipacv2setup.exe"
\ No newline at end of file
+C:\sc\tools\wget\wget.exe -O "C:\sc\tools\ipac\winipacv2setup.exe" "https://www.ultimarc.com/winipacv2setup.exe"
\ No newline at end of file
diff --git a/scripts/ps/makerespt.ps1 b/scripts/ps/makerespt.ps1
index f584797..9e6ecae 100644
--- a/scripts/ps/makerespt.ps1
+++ b/scripts/ps/makerespt.ps1
@@ -10,7 +10,7 @@ if ( $? -neq True )
         vSCRestorePointUserResponse = Read-Host "C / S?"
                     if ($vSCNextHopUserResponse -contains "C")
                         {
-                            #PSUDEOCODE - Continue to next script (TODO)
+                            Exit 1
                         }
                         
                     else
diff --git a/scripts/ps/netcheck.ps1 b/scripts/ps/netcheck.ps1
index 06518ed..46f1f50 100644
--- a/scripts/ps/netcheck.ps1
+++ b/scripts/ps/netcheck.ps1
@@ -43,5 +43,4 @@ function fSCDNSResolutionTest {
     $vSCDNSResolutionTestResult7 = $?
 }
 
-#PSEUDO - Check each hostname for name resolution, if-then to next script (syscheck.ps1)
 
diff --git a/scripts/ps/syscheck.ps1 b/scripts/ps/syscheck.ps1
index 3f3d9fc..fbe7c30 100644
--- a/scripts/ps/syscheck.ps1
+++ b/scripts/ps/syscheck.ps1
@@ -65,7 +65,7 @@ function fSCLicenseKeyCheck
                 vSCLicensedStatusUserResponse = Read-Host "A / F?"
                     if ($vSCNextHopUserResponse -contains "F")
                         {
-                            #PSUDEOCODE - Continue to next script (TODO)
+                            Exit 0
                         }
                         
                         else {
diff --git a/scripts/ps/uninstall.ps1 b/scripts/ps/uninstall.ps1
index 00791b8..2732610 100644
--- a/scripts/ps/uninstall.ps1
+++ b/scripts/ps/uninstall.ps1
@@ -18,5 +18,5 @@ vSCLicensedStatusUserResponse = Read-Host "U / A?"
                         }
 fSCUninstaller
     {
-        #PSEUDO - Todo
+        Remove-Item -Recurse -Force "C:\sc"
     }
\ No newline at end of file