From: AJ ONeal <aj@therootcompany.com>
Date: Sun, 5 Jul 2020 00:18:24 +0000 (+0000)
Subject: fix some $Env handling
X-Git-Url: https://git.josue.xyz/?a=commitdiff_plain;h=48f3faa49db499fb0194d329ea5b08e4d72cff61;p=webi-installers%2F.git

fix some $Env handling
---

diff --git a/_webi/template.ps1 b/_webi/template.ps1
index 38e60e1..6ddd2fc 100644
--- 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 0a1b89f..dd7ac94 100644
--- 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 2de8ff8..0ae4a62 100644
--- 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