X-Git-Url: https://git.josue.xyz/?a=blobdiff_plain;f=mutagen%2Finstall.ps1;h=557426db4c40828b024b750f06fcc06441247af3;hb=d68d0376b9cead7e1bf6446e71f00c8e3c965a45;hp=51a66a63020aa85ec3fd3ed32d16b91d4e7de8c0;hpb=47076b4ef1266957c1fd2d990102a16307b5f2e6;p=webi-installers%2F.git

diff --git a/mutagen/install.ps1 b/mutagen/install.ps1
index 51a66a6..557426d 100644
--- a/mutagen/install.ps1
+++ b/mutagen/install.ps1
@@ -9,14 +9,15 @@ $pkg_cmd_name = "mutagen"
 $pkg_dst_cmd = "$Env:USERPROFILE\.local\bin\mutagen.exe"
 $pkg_dst = "$pkg_dst_cmd"
 
-$pkg_src_cmd = "$Env:USERPROFILE\.local\opt\mutagen-v$Env:WEBI_VERSION\bin\mutagen.exe"
-$pkg_src_bin = "$Env:USERPROFILE\.local\opt\mutagen-v$Env:WEBI_VERSION\bin"
+$pkg_src_cmd = "$Env:USERPROFILE\.local\opt\mutagen-v$Env:WEBI_VERSION\mutagen.exe"
+$pkg_src_bin = "$Env:USERPROFILE\.local\opt\mutagen-v$Env:WEBI_VERSION"
 $pkg_src_dir = "$Env:USERPROFILE\.local\opt\mutagen-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 mutagen from $Env:WEBI_PKG_URL to $pkg_download"
     & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part"
@@ -29,19 +30,18 @@ IF (!(Test-Path -Path "$pkg_src_cmd"))
 
     pushd .local\tmp
 
-        Remove-Item -Path ".\mutagen-v*" -Recurse -ErrorAction Ignore
         Remove-Item -Path ".\mutagen.exe" -Recurse -ErrorAction Ignore
 
         echo "Unpacking $pkg_download"
         & tar xf "$pkg_download"
 
         echo "Install Location: $pkg_src_cmd"
-        New-Item "$pkg_src_bin" -ItemType Directory -Force
-        Move-Item -Path ".\mutagen-*\mutagen.exe" -Destination "$pkg_src_bin"
+        New-Item "$pkg_src_dir" -ItemType Directory -Force | out-null
+        Move-Item -Path ".\*" -Destination "$pkg_src_dir"
 
     popd
 }
 
 echo "Copying into '$pkg_dst_cmd' from '$pkg_src_cmd'"
-Remove-Item -Path "$pkg_dst_cmd" -Recurse -ErrorAction Ignore
+Remove-Item -Path "$pkg_dst_cmd" -Recurse -ErrorAction Ignore | out-null
 Copy-Item -Path "$pkg_src" -Destination "$pkg_dst" -Recurse