From a100d709ce5ef60e5c87f4ba599e5b222f2fc23b Mon Sep 17 00:00:00 2001
From: peteGSX <peteracole@outlook.com.au>
Date: Sat, 8 Apr 2023 06:22:09 +1000
Subject: [PATCH] Install core library, add batch wrapper

---
 install_via_powershell.cmd | 15 +++++++++++++++
 installer.ps1              | 29 +++++++++++++++++++++++++----
 2 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 install_via_powershell.cmd

diff --git a/install_via_powershell.cmd b/install_via_powershell.cmd
new file mode 100644
index 0000000..f367b21
--- /dev/null
+++ b/install_via_powershell.cmd
@@ -0,0 +1,15 @@
+@ECHO OFF
+
+FOR /f "tokens=*" %%a IN ('powershell Get-ExecutionPolicy -Scope CurrentUser') DO SET PS_POLICY=%%a
+
+IF NOT %PS_POLICY=="Bypass" (
+  powershell Set-ExecutionPolicy -Scope CurrentUser Bypass
+)
+
+powershell %~dp0%installer.ps1
+
+IF NOT %PS_POLICY=="Bypass" (
+  powershell Set-ExecutionPolicy -Scope CurrentUser %PS_POLICY%
+)
+
+PAUSE
\ No newline at end of file
diff --git a/installer.ps1 b/installer.ps1
index 0b4e94b..65b0a61 100644
--- a/installer.ps1
+++ b/installer.ps1
@@ -55,7 +55,7 @@ $supportedDevices = @(
 <############################################
 Define global parameters here such as known URLs etc.
 ############################################>
-$installerVersion = "v0.0.2"
+$installerVersion = "v0.0.3"
 $gitHubAPITags = "https://api.github.com/repos/DCC-EX/CommandStation-EX/git/refs/tags"
 $gitHubURLPrefix = "https://github.com/DCC-EX/CommandStation-EX/archive/"
 if ((Get-WmiObject win32_operatingsystem | Select-Object osarchitecture).osarchitecture -eq "64-bit") {
@@ -241,7 +241,6 @@ catch {
 }
 
 $folderName = $buildDirectory + "\CommandStation-EX-" + ($userList[$userSelection] -replace "^v", "")
-Write-Output $folderName
 try {
   Rename-Item -Path $folderName -NewName $commandStationDirectory
 }
@@ -356,12 +355,24 @@ if ($null -eq $boardList[$selectedBoard].matching_boards.name) {
   $devicePort = $boardList[$selectedBoard].port.address
 }
 
+<############################################
+Install core libraries for the platform
+############################################>
+$platformArray = $deviceFQBN.split(":")
+$platform = $platformArray[0] + ":" + $platformArray[1]
+try {
+  & $arduinoCLI core install $platform
+}
+catch {
+  Write-Output "Error install core libraries"
+  Exit
+}
+
 <############################################
 Upload the sketch to the selected board
 ############################################>
 #$arduinoCLI upload -b fqbn -p port $commandStationDirectory
 Write-Output "Compiling and uploading to $deviceName on $devicePort"
-Write-Output "& $arduinoCLI compile -b $deviceFQBN -u -t -p $devicePort $commandStationDirectory"
 try {
   $output = & $arduinoCLI compile -b $deviceFQBN -u -t -p $devicePort $commandStationDirectory --format jsonmini | ConvertFrom-Json
 }
@@ -369,4 +380,14 @@ catch {
   Write-Output "Failed to compile"
   Exit
 }
-Write-Output "$output"
+if ($output.success -eq "True") {
+  Write-Output "`r`nCongratulations! DCC-EX EX-CommandStation $($userList[$userSelection]) has been installed on your $deviceName`r`n"
+} else {
+  Write-Output "`r`nThere was an error installing $($userList[$userSelection]) on your $($deviceName), please take note of the errors provided:`r`n"
+  if ($null -ne $output.compiler_err) {
+    Write-Output "Compiler error: $($output.compiler_err)`r`n"
+  }
+  if ($null -ne $output.builder_result) {
+    Write-Output "Builder result: $($output.builder_result)`r`n"
+  }
+}