switch to unix-style paths because... powershell?

[webi-installers/.git] / golang / install.ps1

diff --git a/golang/install.ps1 b/golang/install.ps1
index 271960a84508be0991c7f22cd4b2d5332f3dfd7c..eb0dab1e6f0501f7f27cb0a07bcaaa603455cf7a 100644 (file)
--- a/golang/install.ps1
+++ b/golang/install.ps1
@@ -9,6 +9,11 @@ $pkg_dst = "$Env:USERPROFILE\.local\opt\$pkg_cmd_name"
 $pkg_dst_cmd = "$pkg_dst\bin\$pkg_cmd_name"
 $pkg_dst_bin = "$pkg_dst\bin"
 
+if (!(Get-Command "git.exe" -ErrorAction SilentlyContinue))
+{
+    & powershell -ExecutionPolicy Bypass "$Env:USERPROFILE\.local\bin\webi.ps1" git
+}
+
 # Fetch archive
 IF (!(Test-Path -Path "$pkg_download"))
 {
@@ -69,9 +74,11 @@ echo stringer
 & "$pkg_dst_cmd" get golang.org/x/tools/cmd/stringer 
 
 # Add to path
-& "$Env:USERPROFILE\.local\bin\pathman.exe" add "$Env:USERPROFILE\.local\opt\go\bin"
+& "$Env:USERPROFILE\.local\bin\pathman.exe" add ~/.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 "$Env:USERPROFILE\go\bin"
+& "$Env:USERPROFILE\.local\bin\pathman.exe" add ~/go/bin
+#& "$Env:USERPROFILE\.local\bin\pathman.exe" add "$Env:USERPROFILE\go\bin"
 #& "$Env:USERPROFILE\.local\bin\pathman.exe" add %USERPROFILE%\go\bin