projects
/
webi-installers
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added shfmt
[webi-installers/.git]
/
golang
/
install.ps1
diff --git
a/golang/install.ps1
b/golang/install.ps1
index 271960a84508be0991c7f22cd4b2d5332f3dfd7c..44a0db8e743cebe36d6a87be6137625980ac6b63 100644
(file)
--- a/
golang/install.ps1
+++ b/
golang/install.ps1
@@
-9,6
+9,13
@@
$pkg_dst = "$Env:USERPROFILE\.local\opt\$pkg_cmd_name"
$pkg_dst_cmd = "$pkg_dst\bin\$pkg_cmd_name"
$pkg_dst_bin = "$pkg_dst\bin"
$pkg_dst_cmd = "$pkg_dst\bin\$pkg_cmd_name"
$pkg_dst_bin = "$pkg_dst\bin"
+if (!(Get-Command "git.exe" -ErrorAction SilentlyContinue))
+{
+ & "$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
IF (!(Test-Path -Path "$pkg_download"))
{
# Fetch archive
IF (!(Test-Path -Path "$pkg_download"))
{
@@
-47,7
+54,7
@@
IF (!(Test-Path -Path "$pkg_src"))
echo "Copying into '$pkg_dst' from '$pkg_src'"
Remove-Item -Path "$pkg_dst" -Recurse -ErrorAction Ignore
Copy-Item -Path "$pkg_src" -Destination "$pkg_dst" -Recurse
echo "Copying into '$pkg_dst' from '$pkg_src'"
Remove-Item -Path "$pkg_dst" -Recurse -ErrorAction Ignore
Copy-Item -Path "$pkg_src" -Destination "$pkg_dst" -Recurse
-IF (!(Test-Path -Path go\bin)) { New-Item -Path go\bin -ItemType Directory }
+IF (!(Test-Path -Path go\bin)) { New-Item -Path go\bin -ItemType Directory
-Force
}
# Special to go: re-run all go tooling builds
echo "Building go language tools..."
# Special to go: re-run all go tooling builds
echo "Building go language tools..."
@@
-69,9
+76,11
@@
echo stringer
& "$pkg_dst_cmd" get golang.org/x/tools/cmd/stringer
# Add to path
& "$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 %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
#& "$Env:USERPROFILE\.local\bin\pathman.exe" add %USERPROFILE%\go\bin