From: James Bohan <j.carter.bohan@gmail.com>
Date: Thu, 25 Mar 2021 09:53:31 +0000 (-0700)
Subject: Replaced all instances of webi.ps1 with webi-pwsh.ps1
X-Git-Url: https://git.josue.xyz/?a=commitdiff_plain;h=7a5d0527cb93ba58efbadeea95080f824feb827d;p=webi-installers%2F.git

Replaced all instances of webi.ps1 with webi-pwsh.ps1
---

diff --git a/_webi/bootstrap.ps1 b/_webi/bootstrap.ps1
index 0060fab..ace4f3a 100644
--- a/_webi/bootstrap.ps1
+++ b/_webi/bootstrap.ps1
@@ -1,6 +1,6 @@
 # Download the latest webi, then install {{ exename }}
 New-Item -Path .local\bin -ItemType Directory -Force
 IF ($Env:WEBI_HOST -eq $null -or $Env:WEBI_HOST -eq "") { $Env:WEBI_HOST = "https://webinstall.dev" }
-curl.exe -s -A "windows" "$Env:WEBI_HOST/packages/_webi/webi.ps1" -o "$Env:USERPROFILE\.local\bin\webi.ps1"
+curl.exe -s -A "windows" "$Env:WEBI_HOST/packages/_webi/webi-pwsh.ps1" -o "$Env:USERPROFILE\.local\bin\webi-pwsh.ps1"
 Set-ExecutionPolicy -Scope Process Bypass
-& "$Env:USERPROFILE\.local\bin\webi.ps1" "{{ exename }}"
+& "$Env:USERPROFILE\.local\bin\webi-pwsh.ps1" "{{ exename }}"
diff --git a/_webi/webi.ps1 b/_webi/webi.ps1
index 3a2b9c6..73f3098 100644
--- a/_webi/webi.ps1
+++ b/_webi/webi.ps1
@@ -30,7 +30,7 @@ New-Item -Path .local\bin -ItemType Directory -Force
 New-Item -Path .local\xbin -ItemType Directory -Force
 
 # 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"
+Set-Content -Path .local\bin\webi.bat -Value "@echo off`r`npushd %USERPROFILE%`r`npowershell -ExecutionPolicy Bypass .local\bin\webi-pwsh.ps1 %1`r`npopd"
 if (!(Test-Path -Path .local\opt))
 {
     New-Item -Path .local\opt -ItemType Directory -Force
diff --git a/_webi/webi.ps1.bat b/_webi/webi.ps1.bat
index 17915ad..9badacc 100644
--- a/_webi/webi.ps1.bat
+++ b/_webi/webi.ps1.bat
@@ -1 +1 @@
-powershell -ExecutionPolicy Bypass .\.local\bin\webi.ps1 %1
+powershell -ExecutionPolicy Bypass .\.local\bin\webi-pwsh.ps1 %1
diff --git a/golang/install.ps1 b/golang/install.ps1
index 44a0db8..8b7f8c2 100644
--- a/golang/install.ps1
+++ b/golang/install.ps1
@@ -11,7 +11,7 @@ $pkg_dst_bin = "$pkg_dst\bin"
 
 if (!(Get-Command "git.exe" -ErrorAction SilentlyContinue))
 {
-    & "$Env:USERPROFILE\.local\bin\webi.ps1" git
+    & "$Env:USERPROFILE\.local\bin\webi-pwsh.ps1" git
     # because we need git.exe to be available to golang immediately
     $Env:PATH = "$Env:USERPROFILE\.local\opt\git\cmd;$Env:PATH"
 }
diff --git a/webi/README.md b/webi/README.md
index 0455538..872a9d6 100644
--- a/webi/README.md
+++ b/webi/README.md
@@ -63,7 +63,7 @@ These are the files that are installed when you use [webinstall.dev](/):
 
 # Windows 10
 ~/.local/bin/webi.cmd
-~/.local/bin/webi.ps1
+~/.local/bin/webi-pwsh.ps1
 ~/.local/bin/pathman.exe
 ~/.local/opt/pathman-*
 ```