From e5bda52ef30de6996184d9edbc6ce7ff5ae1bc06 Mon Sep 17 00:00:00 2001
From: AJ ONeal <aj@therootcompany.com>
Date: Sun, 12 Nov 2023 08:14:15 +0000
Subject: [PATCH 1/4] fix(windows): classify arm32 as armv7

---
 _webi/normalize.js | 2 +-
 _webi/ua-detect.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/_webi/normalize.js b/_webi/normalize.js
index 90e6cae28..0a5e9387c 100644
--- a/_webi/normalize.js
+++ b/_webi/normalize.js
@@ -50,7 +50,7 @@ var arches = [
 // https://git.com/org/foo/releases/v0.7.9/foo-x86_64-linux-musl.tar.gz
 //
 var archMap = {
-  armv7l: /(\b|_)(armv?7l?)/i,
+  armv7l: /(\b|_)(arm32|armv?7l?)/i,
   //amd64: /(amd.?64|x64|[_\-]64)/i,
   amd64:
     /(\b|_|amd|(dar)?win(dows)?|mac(os)?|linux|osx|x)64([_\-]?bit)?(\b|_)/i,
diff --git a/_webi/ua-detect.js b/_webi/ua-detect.js
index 8b97f5874..4967f5f41 100644
--- a/_webi/ua-detect.js
+++ b/_webi/ua-detect.js
@@ -67,7 +67,7 @@ function getArch(ua) {
 
   if (/aarch64|arm64|arm8|armv8/i.test(ua)) {
     return 'arm64';
-  } else if (/aarch|arm7|armv7/i.test(ua)) {
+  } else if (/aarch|arm7|armv7|arm32/i.test(ua)) {
     return 'armv7l';
   } else if (/arm6|armv6/i.test(ua)) {
     return 'armv6l';

From 3e97590568d92cc1556e6d2f2cdc5598d4c96b1d Mon Sep 17 00:00:00 2001
From: AJ ONeal <aj@therootcompany.com>
Date: Sun, 12 Nov 2023 01:30:54 -0700
Subject: [PATCH 2/4] fix(windows): show machine info

---
 webi/webi-pwsh.ps1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webi/webi-pwsh.ps1 b/webi/webi-pwsh.ps1
index 5484f613c..4371bc53b 100644
--- a/webi/webi-pwsh.ps1
+++ b/webi/webi-pwsh.ps1
@@ -185,6 +185,7 @@ $Env:WEBI_UA = Get-UserAgent
 IF ($IsWebiParent) {
     Write-Host ""
     Write-Host "${TName}Welcome to${TReset} ${TTask}Webi${TReset}${TName}!${TReset} - Instant Installs, Easy to Remember URLs"
+    Write-Host "${TDim}($Env:WEBI_UA)${TReset}"
     Write-Host ""
 }
 

From 0c99e0272e7927bdbaa7b38d1d21e6a768e59497 Mon Sep 17 00:00:00 2001
From: AJ ONeal <aj@therootcompany.com>
Date: Sun, 12 Nov 2023 02:14:02 -0700
Subject: [PATCH 3/4] fix(webi): add exec bit

---
 webi/webi-pwsh.ps1 | 0
 webi/webi.sh       | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 webi/webi-pwsh.ps1
 mode change 100644 => 100755 webi/webi.sh

diff --git a/webi/webi-pwsh.ps1 b/webi/webi-pwsh.ps1
old mode 100644
new mode 100755
diff --git a/webi/webi.sh b/webi/webi.sh
old mode 100644
new mode 100755

From 77abc40e1f04502ccd3a9249c61c66bf38952d12 Mon Sep 17 00:00:00 2001
From: AJ ONeal <aj@therootcompany.com>
Date: Sat, 11 Nov 2023 20:10:41 +0000
Subject: [PATCH 4/4] WIP: ref!(webi): cleanup for later

---
 webi/webi-pwsh.ps1 | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/webi/webi-pwsh.ps1 b/webi/webi-pwsh.ps1
index 4371bc53b..13acc7121 100755
--- a/webi/webi-pwsh.ps1
+++ b/webi/webi-pwsh.ps1
@@ -4,7 +4,7 @@ Set-ExecutionPolicy -Scope Process Bypass
 $ErrorActionPreference = 'Stop'
 $ProgressPreference = 'SilentlyContinue'
 
-$my_version = 'v1.1.16'
+$my_version = 'v1.2.0'
 
 IF ($null -eq $Env:WEBI_HOST -or $Env:WEBI_HOST -eq "") {
     $Env:WEBI_HOST = "https://webinstall.dev"
@@ -125,23 +125,25 @@ function Show-HowToUpdateEnv {
     Write-Host ""
 }
 
-# Switch to userprofile
-Push-Location $Env:USERPROFILE
+function Install-Webi {
+    # Make paths if needed
+    # TODO replace all bin with opt\bin\
+    $null = New-Item -Path "$HOME\.local\bin\" -ItemType Directory -Force
+    $null = New-Item -Path "$HOME\.local\opt\" -ItemType Directory -Force
 
-# Make paths if needed
-# TODO replace all bin with opt\bin\
-New-Item -Path "$HOME\.local\bin\" -ItemType Directory -Force | Out-Null
+    # See note on Set-ExecutionPolicy above
+    Set-Content -Path "$HOME\.local\bin\webi.bat" -Value "@echo off`r`npowershell -ExecutionPolicy Bypass %USERPROFILE%\.local\bin\webi-pwsh.ps1 %*"
 
-# See note on Set-ExecutionPolicy above
-Set-Content -Path "$HOME\.local\bin\webi.bat" -Value "@echo off`r`npowershell -ExecutionPolicy Bypass %USERPROFILE%\.local\bin\webi-pwsh.ps1 %*"
-# Backwards-compat bugfix: remove old webi-pwsh.ps1 location
-Remove-Item -Path "$HOME\.local\bin\webi.ps1" -Recurse -ErrorAction Ignore
-if (!(Test-Path -Path "$HOME\.local\opt")) {
-    New-Item -Path "$HOME\.local\opt" -ItemType Directory -Force | Out-Null
-}
-# TODO windows version of mktemp -d
-if (!(Test-Path -Path "$HOME\.local\tmp")) {
-    New-Item -Path "$HOME\.local\tmp" -ItemType Directory -Force | Out-Null
+    # Backwards-compat bugfix: remove old webi-pwsh.ps1 location
+    Remove-Item -Path "$HOME\.local\bin\webi.ps1" -Recurse -ErrorAction Ignore
+
+    # TODO windows version of mktemp -d
+    IF (Test-Path -Path "$HOME\.local\tmp") {
+        Write-Host "    Found $HOME\.local\tmp\"
+    } ELSE {
+        Write-Host "    Creating $HOME\.local\tmp\"
+        $null = New-Item -Path "$HOME\.local\tmp" -ItemType Directory -Force | Out-Null
+    }
 }
 
 ## show help if no params given or help flags are used
@@ -180,6 +182,9 @@ if ($exename -eq "-V" -or $exename -eq "--version" -or $exename -eq "version" -o
     exit 0
 }
 
+# Switch to userprofile
+Push-Location $Env:USERPROFILE
+
 $Env:WEBI_UA = Get-UserAgent
 
 IF ($IsWebiParent) {