X-Git-Url: https://git.josue.xyz/?a=blobdiff_plain;f=shfmt%2Finstall.ps1;h=447d70d4c9153aa41d4f171c9c9dcfbb72ad3695;hb=b1d3b44f966332434d8ec49b2a0df569e9bf8c16;hp=29d262784c81f41e3a977aaaf921759ebaf543b3;hpb=dbeef945f552f6554d78e644d3e0b5ca9f6603e1;p=webi-installers%2F.git

diff --git a/shfmt/install.ps1 b/shfmt/install.ps1
index 29d2627..447d70d 100644
--- a/shfmt/install.ps1
+++ b/shfmt/install.ps1
@@ -14,9 +14,10 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\shfmt-v$Env:WEBI_VERSION\bin"
 $pkg_src_dir = "$Env:USERPROFILE\.local\opt\shfmt-v$Env:WEBI_VERSION"
 $pkg_src = "$pkg_src_cmd"
 
-$pkg_download = "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
+New-Item "$Env:USERPROFILE\Downloads\webi" -ItemType Directory -Force | out-null
+$pkg_download = "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
 
-IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"))
+IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"))
 {
     echo "Downloading shfmt from $Env:WEBI_PKG_URL to $pkg_download"
     & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part"
@@ -26,18 +27,20 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"))
 IF (!(Test-Path -Path "$pkg_src_cmd"))
 {
     echo "Installing shfmt"
-    pushfmtd .local\tmp
+    
+    # TODO: create package-specific temp directory
+    # Enter tmp
+    pushd .local\tmp
 
-        Remove-Item -Path ".\shfmt-v*" -Recurse -ErrorAction Ignore
-        Remove-Item -Path ".\shfmt.exe" -Recurse -ErrorAction Ignore
-
-        echo "Unpacking $pkg_download"
-        & tar xf "$pkg_download"
+        # Move single binary into root of temporary folder
+        & move "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" "shfmt.exe"
 
+        # Settle unpacked archive into place
         echo "Install Location: $pkg_src_cmd"
-        New-Item "$pkg_src_bin" -ItemType Directory -Force
-        Move-Item -Path ".\shfmt-*\shfmt.exe" -Destination "$pkg_src_bin"
+        New-Item "$pkg_src_bin" -ItemType Directory -Force | out-null
+        Move-Item -Path "shfmt.exe" -Destination "$pkg_src_bin"
 
+    # Exit tmp
     popd
 }