From 58841a30031e1c560ab2a4942ce91b69de0ed601 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Sat, 4 Jul 2020 22:00:30 +0000 Subject: [PATCH] switch to unix-style paths because... powershell? --- _webi/template.ps1 | 3 ++- _webi/webi.ps1 | 3 ++- git/install.ps1 | 3 ++- golang/install.ps1 | 6 ++++-- node/install.ps1 | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/_webi/template.ps1 b/_webi/template.ps1 index 4ca9fe1..5eca6fa 100644 --- a/_webi/template.ps1 +++ b/_webi/template.ps1 @@ -34,7 +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 ~/.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 ac4886f..b879673 100644 --- a/_webi/webi.ps1 +++ b/_webi/webi.ps1 @@ -48,7 +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 ~/.local/bin +#& "$Env:USERPROFILE\.local\bin\pathman.exe" add "$Env:USERPROFILE\.local\bin" #& "$Env:USERPROFILE\.local\bin\pathman.exe" add %USERPROFILE%\.local\bin # {{ baseurl }} diff --git a/git/install.ps1 b/git/install.ps1 index bf53e21..d47b209 100644 --- a/git/install.ps1 +++ b/git/install.ps1 @@ -53,5 +53,6 @@ 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 "$Env:USERPROFILE\.local\opt\git\cmd" +& "$Env:USERPROFILE\.local\bin\pathman.exe" add ~/.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 5649e07..eb0dab1 100644 --- a/golang/install.ps1 +++ b/golang/install.ps1 @@ -74,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 diff --git a/node/install.ps1 b/node/install.ps1 index 75b557e..0d475fc 100644 --- a/node/install.ps1 +++ b/node/install.ps1 @@ -44,4 +44,4 @@ Copy-Item -Path "$Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERSION" - & .\.local\opt\node\npm.cmd --scripts-prepend-node-path=true config set scripts-prepend-node-path true # Add to path -& "$Env:USERPROFILE\.local\bin\pathman.exe" add "$Env:USERPROFILE\.local\opt\node" +& "$Env:USERPROFILE\.local\bin\pathman.exe" add ~/.local/opt/node -- 2.25.1