powershell updates

[webi-installers/.git] / _webi / bootstrap.ps1

diff --git a/_webi/bootstrap.ps1 b/_webi/bootstrap.ps1
index c01089b549d78b72f706ed83f5ace4617e2692c4..168c457ff6a4c4e9b88516e69d7be4d9c8783568 100644 (file)
--- a/_webi/bootstrap.ps1
+++ b/_webi/bootstrap.ps1
@@ -1,3 +1,5 @@
+#!/usr/bin/env pwsh
+
 # If a command returns an error, halt the script.
 $ErrorActionPreference = 'Stop'
 
@@ -21,22 +23,25 @@ pushd .local\bin
 
 # TODO SetStrictMode
 # TODO Test-Path variable:global:Env:WEBI_HOST ???
-IF(!$Env:WEBI_HOST)
+IF($Env:WEBI_HOST -eq $null -or $Env:WEBI_HOST -eq "")
 {
     $Env:WEBI_HOST = "https://webinstall.dev"
 }
 
 # Fetch webi.bat
-Invoke-WebRequest "$Env:WEBI_HOST/packages/_webi/webi.ps1.bat" -OutFile webi.bat
-Invoke-WebRequest "$Env:WEBI_HOST/packages/_webi/webi.ps1" -OutFile webi.ps1
+echo "$Env:WEBI_HOST/packages/_webi/webi.ps1"
+curl.exe -s -A "windows" "$Env:WEBI_HOST/packages/_webi/webi.ps1.bat" -o webi.bat
+curl.exe -s -A "windows" "$Env:WEBI_HOST/packages/_webi/webi.ps1" -o webi.ps1
 
 popd
 
-# Run webi.bat
-& .\.local\bin\webi.bat {{ exename }}
+# Run webi.ps1
+#TODO Set-ExecutionPolicy -ExecutionPolicy Bypass
+Invoke-Expression "powershell -ExecutionPolicy Bypass .\.local\bin\webi.ps1 {{ exename }}"
 
 # Run pathman to set up the folder
-& "$Env:USERPROFILE\.local\bin\pathman.exe" add "$Env:USERPROFILE\.local\.bin"
+#& "$Env:USERPROFILE\.local\bin\pathman.exe" add "$Env:USERPROFILE\.local\.bin"
+& "$Env:USERPROFILE\.local\bin\pathman.exe" add .local\.bin
 
 # Done
 popd