X-Git-Url: https://git.josue.xyz/?a=blobdiff_plain;f=rg%2Finstall.ps1;h=3e8bf670cb6be783d21e38be5f09d6e0a3a9b525;hb=4edf137e5d6b65f9ac847db6694ac387c7e91f3e;hp=a721bb3e36b457044f46203d02371a755fd768ed;hpb=fa753e15b9b048f3ed82fdaf2a7a0cfd7f37ac3d;p=webi-installers%2F.git diff --git a/rg/install.ps1 b/rg/install.ps1 index a721bb3..3e8bf67 100644 --- a/rg/install.ps1 +++ b/rg/install.ps1 @@ -15,10 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\ripgrep-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\ripgrep-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" # Fetch archive -IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE")) +IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) { # TODO: arch detection echo "Downloading ripgrep from $Env:WEBI_PKG_URL to $pkg_download" @@ -34,7 +35,7 @@ IF (!(Test-Path -Path "$pkg_src_cmd")) # Enter tmp pushd .local\tmp - # Remove any leftover tmp cruft + # Remove any leftover tmp cruft Remove-Item -Path ".\ripgrep-v*" -Recurse -ErrorAction Ignore Remove-Item -Path ".\rg.exe" -Recurse -ErrorAction Ignore @@ -42,11 +43,11 @@ IF (!(Test-Path -Path "$pkg_src_cmd")) # Windows BSD-tar handles zip. Imagine that. echo "Unpacking $pkg_download" & tar xf "$pkg_download" - + # Settle unpacked archive into place echo "Install Location: $pkg_src_cmd" - New-Item "$pkg_src_bin" -ItemType Directory -Force + New-Item "$pkg_src_bin" -ItemType Directory -Force | out-null Move-Item -Path ".\ripgrep-*\rg.exe" -Destination "$pkg_src_bin" # Exit tmp @@ -54,5 +55,5 @@ IF (!(Test-Path -Path "$pkg_src_cmd")) } 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