From a9f17e551d2d6380a5a11b35c040339b2a12d45a Mon Sep 17 00:00:00 2001
From: AJ ONeal <aj@therootcompany.com>
Date: Sat, 4 Jul 2020 07:19:14 +0000
Subject: [PATCH] switch Windows to to Env:USERPROFILE

---
 _webi/template.ps1 | 4 ++--
 _webi/webi.ps1     | 4 ++--
 git/install.ps1    | 3 ++-
 golang/install.ps1 | 6 ++++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/_webi/template.ps1 b/_webi/template.ps1
index 491e3a5..4ca9fe1 100644
--- a/_webi/template.ps1
+++ b/_webi/template.ps1
@@ -34,8 +34,8 @@ if (!(Test-Path -Path .local\opt))
 # {{ version }}
 
 # 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 %USERPROFILE%\.local\bin
+& "$Env:USERPROFILE\.local\bin\pathman.exe" add "$Env:USERPROFILE\.local\bin"
+#& "$Env:USERPROFILE\.local\bin\pathman.exe" add %USERPROFILE%\.local\bin
 
 {{ installer }}
 
diff --git a/_webi/webi.ps1 b/_webi/webi.ps1
index d18996c..ac4886f 100644
--- a/_webi/webi.ps1
+++ b/_webi/webi.ps1
@@ -48,8 +48,8 @@ if (!(Test-Path -Path .local\bin\pathman.exe))
 }
 
 # 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 %USERPROFILE%\.local\bin
+& "$Env:USERPROFILE\.local\bin\pathman.exe" add "$Env:USERPROFILE\.local\bin"
+#& "$Env:USERPROFILE\.local\bin\pathman.exe" add %USERPROFILE%\.local\bin
 
 # {{ baseurl }}
 # {{ version }}
diff --git a/git/install.ps1 b/git/install.ps1
index d6d1e22..bf53e21 100644
--- a/git/install.ps1
+++ b/git/install.ps1
@@ -53,4 +53,5 @@ Remove-Item -Path "$pkg_dst" -Recurse -ErrorAction Ignore
 Copy-Item -Path "$pkg_src" -Destination "$pkg_dst" -Recurse
 
 # Add to path
-& "$Env:USERPROFILE\.local\bin\pathman.exe" add %USERPROFILE%\.local\opt\git\cmd
+& "$Env:USERPROFILE\.local\bin\pathman.exe" add "$Env:USERPROFILE\.local\opt\git\cmd"
+#& "$Env:USERPROFILE\.local\bin\pathman.exe" add %USERPROFILE%\.local\opt\git\cmd
diff --git a/golang/install.ps1 b/golang/install.ps1
index f2ded21..271960a 100644
--- a/golang/install.ps1
+++ b/golang/install.ps1
@@ -69,7 +69,9 @@ echo stringer
 & "$pkg_dst_cmd" get golang.org/x/tools/cmd/stringer 
 
 # Add to path
-& "$Env:USERPROFILE\.local\bin\pathman.exe" add %USERPROFILE%\.local\opt\go\bin
+& "$Env:USERPROFILE\.local\bin\pathman.exe" add "$Env:USERPROFILE\.local\opt\go\bin"
+#& "$Env:USERPROFILE\.local\bin\pathman.exe" add %USERPROFILE%\.local\opt\go\bin
 
 # Special to go: add default GOBIN to PATH
-& "$Env:USERPROFILE\.local\bin\pathman.exe" add %USERPROFILE%\go\bin
+& "$Env:USERPROFILE\.local\bin\pathman.exe" add "$Env:USERPROFILE\go\bin"
+#& "$Env:USERPROFILE\.local\bin\pathman.exe" add %USERPROFILE%\go\bin
-- 
2.25.1