X-Git-Url: https://git.josue.xyz/?a=blobdiff_plain;f=node%2Finstall.ps1;h=f8b55ca8c7d2df37d2bfed1c620ea413e7087c26;hb=91512157ab426c87e0a82b594620e90e324b23a3;hp=64a60969962e9d4a3b85f64072af1fda00ba3c65;hpb=681cccd4d5f2adb81470ee99ede927a6de896c3b;p=webi-installers%2F.git

diff --git a/node/install.ps1 b/node/install.ps1
index 64a6096..f8b55ca 100644
--- a/node/install.ps1
+++ b/node/install.ps1
@@ -1,12 +1,13 @@
-# Fetch archive
+#!/usr/bin/env pwsh
 
-IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"))
+# Fetch archive
+IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"))
 {
     # TODO: arch detection
-    echo "Downloading $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
+    echo "Downloading $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
     #Invoke-WebRequest https://nodejs.org/dist/v12.16.2/node-v12.16.2-win-x64.zip -OutFile node-v12.16.2-win-x64.zip
-    & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE.part"
-    & move "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE.part" "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
+    & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE.part"
+    & move "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE.part" "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
 }
 
 IF (!(Test-Path -Path "$Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERSION"))
@@ -17,14 +18,13 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERS
     # Enter opt
     pushd .local\tmp
 
-        echo "Remove leftover node-v* stuffs"
+        # Remove any leftover tmp cruft
         Remove-Item -Path "node-v*" -Recurse -ErrorAction Ignore
 
         # Unpack archive
         # Windows BSD-tar handles zip. Imagine that.
-        echo "Unpacking $Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
-        & tar xf "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
-        Get-ChildItem "node-v*"
+        echo "Unpacking $Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
+        & tar xf "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
 
         # Settle unpacked archive into place
         echo "New Name: $Env:PKG_NAME-v$Env:WEBI_VERSION"
@@ -36,12 +36,12 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERS
     popd
 }
 
-echo "Versioning $Env:PKG_NAME"
-Remove-Item -Path "$Env:USERPROFILE\.local\opt\node" -Recurse -ErrorAction Ignore
+echo "Copying into '$Env:USERPROFILE\.local\opt\$Env:PKG_NAME' from '$Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERSION'"
+Remove-Item -Path "$Env:USERPROFILE\.local\opt\$Env:PKG_NAME" -Recurse -ErrorAction Ignore
 Copy-Item -Path "$Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERSION" -Destination "$Env:USERPROFILE\.local\opt\$Env:PKG_NAME" -Recurse
 
 # make npm not act stupid about which node to use... ugh (this should be the default)
 & .\.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 .local\opt\node
+& "$Env:USERPROFILE\.local\bin\pathman.exe" add ~/.local/opt/node