fix some $Env handling

diff --git a/_webi/template.ps1 b/_webi/template.ps1
index 38e60e161292c6f4b7138fefead0c97535a22fde..6ddd2fcee73bc4242c53bba48e09eda27a03eff4 100644 (file)
--- a/_webi/template.ps1
+++ b/_webi/template.ps1
@@ -1,5 +1,10 @@
 #!/usr/bin/env pwsh
 
+# this allows us to call ps1 files, which allows us to have spaces in filenames
+# ('powershell "$Env:USERPROFILE\test.ps1" foo' will fail if it has a space in
+# the path but '& "$Env:USERPROFILE\test.ps1" foo' will work even with a space)
+Set-ExecutionPolicy -Scope Process Bypass
+
 # If a command returns an error, halt the script.
 $ErrorActionPreference = 'Stop'
 

diff --git a/_webi/webi.ps1 b/_webi/webi.ps1
index 0a1b89f9f9946db7d22ad909b2c7be79d3e3ab0c..dd7ac945b78b80e6ac91e11746d48057c7facf8c 100644 (file)
--- a/_webi/webi.ps1
+++ b/_webi/webi.ps1
@@ -1,5 +1,10 @@
 #!/usr/bin/env pwsh
 
+# this allows us to call ps1 files, which allows us to have spaces in filenames
+# ('powershell "$Env:USERPROFILE\test.ps1" foo' will fail if it has a space in
+# the path but '& "$Env:USERPROFILE\test.ps1" foo' will work even with a space)
+Set-ExecutionPolicy -Scope Process Bypass
+
 # If a command returns an error, halt the script.
 $ErrorActionPreference = 'Stop'
 
@@ -28,6 +33,7 @@ if (!(Test-Path -Path .local\xbin))
 {
     New-Item -Path .local\xbin -ItemType Directory
 }
+# See note on Set-ExecutionPolicy above
 Set-Content -Path .local\bin\webi.bat -Value "@echo off`r`npushd %USERPROFILE%`r`npowershell -ExecutionPolicy Bypass .local\bin\webi.ps1 %1`r`npopd"
 if (!(Test-Path -Path .local\opt))
 {

diff --git a/golang/install.ps1 b/golang/install.ps1
index 2de8ff8c97a2cdea99a45d1b592acca4832b80d9..0ae4a62388195411f0139040b7589c79948ee10e 100644 (file)
--- a/golang/install.ps1
+++ b/golang/install.ps1
@@ -11,7 +11,9 @@ $pkg_dst_bin = "$pkg_dst\bin"
 
 if (!(Get-Command "git.exe" -ErrorAction SilentlyContinue))
 {
-    & powershell -ExecutionPolicy Bypass "$Env:USERPROFILE\.local\bin\webi.ps1" git
+    & "$Env:USERPROFILE\.local\bin\webi.ps1" git
+    # because we need git.exe to be available to golang immediately
+    $Env:PATH = "$Env:USERPROFILE\.local\opt\git\cmd;$Env:PATH"
 }
 
 # Fetch archive