From 894562bc0c2e40cfdc36ee3ca293a354a04786d0 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Sun, 14 Nov 2021 10:05:01 +0000 Subject: [PATCH] refactor!: namespace downloads to ~/Downloads/webi on Windows --- _example/install.ps1 | 6 +++--- arc/install.ps1 | 8 ++++---- awless/install.ps1 | 6 +++--- bat/install.ps1 | 12 ++++++------ caddy/install.ps1 | 6 +++--- chromedriver/install.ps1 | 6 +++--- comrak/install.ps1 | 10 +++++----- curlie/install.ps1 | 12 ++++++------ deno/install.ps1 | 12 ++++++------ dotenv-linter/install.ps1 | 6 +++--- dotenv/install.ps1 | 6 +++--- fd/install.ps1 | 12 ++++++------ ffmpeg/install.ps1 | 6 +++--- fzf/install.ps1 | 12 ++++++------ gh/install.ps1 | 6 +++--- git/install.ps1 | 4 ++-- gitdeploy/install.ps1 | 6 +++--- gitea/install.ps1 | 8 ++++---- golang/install.ps1 | 4 ++-- goreleaser/install.ps1 | 6 +++--- gprox/install.ps1 | 6 +++--- hugo/install.ps1 | 6 +++--- jq/install.ps1 | 12 ++++++------ k9s/install.ps1 | 6 +++--- keypairs/install.ps1 | 6 +++--- kind/install.ps1 | 6 +++--- kubectx/install.ps1 | 6 +++--- kubens/install.ps1 | 6 +++--- lf/install.ps1 | 6 +++--- lsd/install.ps1 | 6 +++--- mutagen/install.ps1 | 6 +++--- node/install.ps1 | 12 ++++++------ pandoc/install.ps1 | 6 +++--- rclone/install.ps1 | 6 +++--- rg/install.ps1 | 6 +++--- sass/install.ps1 | 6 +++--- sclient/install.ps1 | 6 +++--- sd/install.ps1 | 6 +++--- serviceman/install.ps1 | 6 +++--- shellcheck/install.ps1 | 6 +++--- shfmt/install.ps1 | 6 +++--- syncthing/install.ps1 | 6 +++--- watchexec/install.ps1 | 6 +++--- wsl.bak/install.ps1 | 4 ++-- wsl/install.ps1 | 8 ++++---- xz/install.ps1 | 6 +++--- yq/install.ps1 | 6 +++--- zoxide/install.ps1 | 6 +++--- 48 files changed, 167 insertions(+), 167 deletions(-) diff --git a/_example/install.ps1 b/_example/install.ps1 index cb64519..2fb5b5c 100644 --- a/_example/install.ps1 +++ b/_example/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\foobar-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\foobar-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 foobar from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/arc/install.ps1 b/arc/install.ps1 index d1ca23c..111e166 100644 --- a/arc/install.ps1 +++ b/arc/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\archiver-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\archiver-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 archiver from $Env:WEBI_PKG_URL to $pkg_download" @@ -40,7 +40,7 @@ IF (!(Test-Path -Path "$pkg_src_cmd")) Remove-Item -Path ".\arc.exe" -Recurse -ErrorAction Ignore # Move single binary into root of temporary folder - & move "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE" "arc.exe" + & move "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" "arc.exe" # Settle unpacked archive into place echo "Install Location: $pkg_src_cmd" diff --git a/awless/install.ps1 b/awless/install.ps1 index 1863f93..a203cc7 100644 --- a/awless/install.ps1 +++ b/awless/install.ps1 @@ -16,11 +16,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\awless-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\awless-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 awless from $Env:WEBI_PKG_URL to $pkg_download" & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part" diff --git a/bat/install.ps1 b/bat/install.ps1 index c324a86..44e0fee 100644 --- a/bat/install.ps1 +++ b/bat/install.ps1 @@ -3,12 +3,12 @@ $VERNAME = "$Env:PKG_NAME-v$Env:WEBI_VERSION.exe" $EXENAME = "$Env:PKG_NAME.exe" # 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 $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE" - & 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" + echo "Downloading $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\webi\$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\xbin\$VERNAME")) @@ -24,8 +24,8 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) # 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" + echo "Unpacking $Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" + & tar xf "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" # Move single binary into root of temporary folder & move "bat-*\$EXENAME" "$VERNAME" diff --git a/caddy/install.ps1 b/caddy/install.ps1 index 5d46ccc..3b33d3a 100644 --- a/caddy/install.ps1 +++ b/caddy/install.ps1 @@ -16,11 +16,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\caddy-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\caddy-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 caddy from $Env:WEBI_PKG_URL to $pkg_download" & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part" diff --git a/chromedriver/install.ps1 b/chromedriver/install.ps1 index 6c71d5b..18eee9d 100644 --- a/chromedriver/install.ps1 +++ b/chromedriver/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\chromedriver-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\chromedriver-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 chromedriver from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/comrak/install.ps1 b/comrak/install.ps1 index b809652..4bafd32 100644 --- a/comrak/install.ps1 +++ b/comrak/install.ps1 @@ -3,12 +3,12 @@ $VERNAME = "$Env:PKG_NAME-v$Env:WEBI_VERSION.exe" $EXENAME = "$Env:PKG_NAME.exe" # 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 $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE" - & 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" + echo "Downloading $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\webi\$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\bin\$VERNAME")) @@ -23,7 +23,7 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERS Remove-Item -Path "$Env:PKG_NAME-v*" -Recurse -ErrorAction Ignore # Move single binary into root of temporary folder - & move "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE" "$VERNAME" + & move "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" "$VERNAME" # Settle unpacked archive into place echo "New Name: $VERNAME" diff --git a/curlie/install.ps1 b/curlie/install.ps1 index 5b79cc9..caab135 100644 --- a/curlie/install.ps1 +++ b/curlie/install.ps1 @@ -3,12 +3,12 @@ $VERNAME = "$Env:PKG_NAME-v$Env:WEBI_VERSION.exe" $EXENAME = "$Env:PKG_NAME.exe" # 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 $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE" - & 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" + echo "Downloading $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\webi\$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\xbin\$VERNAME")) @@ -24,8 +24,8 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) # 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" + echo "Unpacking $Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" + & tar xf "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" # Move single binary into root of temporary folder & move "$EXENAME" "$VERNAME" diff --git a/deno/install.ps1 b/deno/install.ps1 index 46c7669..94560c0 100644 --- a/deno/install.ps1 +++ b/deno/install.ps1 @@ -1,13 +1,13 @@ #!/usr/bin/env pwsh # 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 $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")) @@ -23,8 +23,8 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERS # 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" + 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" diff --git a/dotenv-linter/install.ps1 b/dotenv-linter/install.ps1 index dd28f76..d5f93e7 100644 --- a/dotenv-linter/install.ps1 +++ b/dotenv-linter/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\dotenv-linter-v$Env:WEBI_VERSION\bin $pkg_src_dir = "$Env:USERPROFILE\.local\opt\dotenv-linter-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 dotenv-linter from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/dotenv/install.ps1 b/dotenv/install.ps1 index e199219..d5648ac 100644 --- a/dotenv/install.ps1 +++ b/dotenv/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\dotenv-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\dotenv-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 dotenv from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/fd/install.ps1 b/fd/install.ps1 index 5b79cc9..caab135 100644 --- a/fd/install.ps1 +++ b/fd/install.ps1 @@ -3,12 +3,12 @@ $VERNAME = "$Env:PKG_NAME-v$Env:WEBI_VERSION.exe" $EXENAME = "$Env:PKG_NAME.exe" # 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 $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE" - & 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" + echo "Downloading $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\webi\$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\xbin\$VERNAME")) @@ -24,8 +24,8 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) # 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" + echo "Unpacking $Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" + & tar xf "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" # Move single binary into root of temporary folder & move "$EXENAME" "$VERNAME" diff --git a/ffmpeg/install.ps1 b/ffmpeg/install.ps1 index 10086db..203e06a 100644 --- a/ffmpeg/install.ps1 +++ b/ffmpeg/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\ffmpeg-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\ffmpeg-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 ffmpeg from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/fzf/install.ps1 b/fzf/install.ps1 index 5b79cc9..caab135 100644 --- a/fzf/install.ps1 +++ b/fzf/install.ps1 @@ -3,12 +3,12 @@ $VERNAME = "$Env:PKG_NAME-v$Env:WEBI_VERSION.exe" $EXENAME = "$Env:PKG_NAME.exe" # 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 $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE" - & 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" + echo "Downloading $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\webi\$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\xbin\$VERNAME")) @@ -24,8 +24,8 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) # 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" + echo "Unpacking $Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" + & tar xf "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" # Move single binary into root of temporary folder & move "$EXENAME" "$VERNAME" diff --git a/gh/install.ps1 b/gh/install.ps1 index ea2f0ab..17c5e98 100644 --- a/gh/install.ps1 +++ b/gh/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\gh-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\gh-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 gh from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/git/install.ps1 b/git/install.ps1 index 5b3858f..f21b912 100644 --- a/git/install.ps1 +++ b/git/install.ps1 @@ -1,8 +1,8 @@ #!/usr/bin/env pwsh $pkg_cmd_name = "git" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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" $pkg_src = "$Env:USERPROFILE\.local\opt\$pkg_cmd_name-v$Env:WEBI_VERSION" diff --git a/gitdeploy/install.ps1 b/gitdeploy/install.ps1 index 2d9286a..f21cad9 100644 --- a/gitdeploy/install.ps1 +++ b/gitdeploy/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\gitdeploy-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\gitdeploy-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 gitdeploy from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/gitea/install.ps1 b/gitea/install.ps1 index 7b1be30..22d2abe 100644 --- a/gitea/install.ps1 +++ b/gitea/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\gitea-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\gitea-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 gitea from $Env:WEBI_PKG_URL to $pkg_download" @@ -40,7 +40,7 @@ IF (!(Test-Path -Path "$pkg_src_cmd")) Remove-Item -Path ".\gitea.exe" -Recurse -ErrorAction Ignore # Move single binary into root of temporary folder - & move "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE" "gitea.exe" + & move "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" "gitea.exe" # Settle unpacked archive into place echo "Install Location: $pkg_src_cmd" diff --git a/golang/install.ps1 b/golang/install.ps1 index 2dbd740..779472f 100644 --- a/golang/install.ps1 +++ b/golang/install.ps1 @@ -1,8 +1,8 @@ #!/usr/bin/env pwsh $pkg_cmd_name = "go" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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" $pkg_src = "$Env:USERPROFILE\.local\opt\$pkg_cmd_name-v$Env:WEBI_VERSION" diff --git a/goreleaser/install.ps1 b/goreleaser/install.ps1 index 990418f..26bab04 100644 --- a/goreleaser/install.ps1 +++ b/goreleaser/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\goreleaser-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\goreleaser-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 goreleaser from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/gprox/install.ps1 b/gprox/install.ps1 index b095726..27c7f93 100644 --- a/gprox/install.ps1 +++ b/gprox/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\gprox-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\gprox-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 gprox from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/hugo/install.ps1 b/hugo/install.ps1 index 2744d7f..68d1a81 100644 --- a/hugo/install.ps1 +++ b/hugo/install.ps1 @@ -16,11 +16,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\hugo-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\hugo-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 hugo from $Env:WEBI_PKG_URL to $pkg_download" & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part" diff --git a/jq/install.ps1 b/jq/install.ps1 index e9d2aba..e54bc46 100644 --- a/jq/install.ps1 +++ b/jq/install.ps1 @@ -3,12 +3,12 @@ $VERNAME = "$Env:PKG_NAME-v$Env:WEBI_VERSION.exe" $EXENAME = "$Env:PKG_NAME.exe" # 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 $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE" - & 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" + echo "Downloading $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\webi\$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\xbin\$VERNAME")) @@ -23,8 +23,8 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) Remove-Item -Path "$Env:PKG_NAME-v*" -Recurse -ErrorAction Ignore # Move single binary into temporary folder - echo "Moving $Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE" - & move "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE" "$VERNAME" + echo "Moving $Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" + & move "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" "$VERNAME" # Settle unpacked archive into place echo "New Name: $VERNAME" diff --git a/k9s/install.ps1 b/k9s/install.ps1 index 2c87997..9d7f3b2 100644 --- a/k9s/install.ps1 +++ b/k9s/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\k9s-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\k9s-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 k9s from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/keypairs/install.ps1 b/keypairs/install.ps1 index bd86db3..8c15983 100644 --- a/keypairs/install.ps1 +++ b/keypairs/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\keypairs-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\keypairs-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 keypairs from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/kind/install.ps1 b/kind/install.ps1 index eed2d2d..85380a5 100644 --- a/kind/install.ps1 +++ b/kind/install.ps1 @@ -14,10 +14,10 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\kind-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\kind-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 kind from $Env:WEBI_PKG_URL to $pkg_download" & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part" diff --git a/kubectx/install.ps1 b/kubectx/install.ps1 index 9fbcbdf..d48ce76 100644 --- a/kubectx/install.ps1 +++ b/kubectx/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\kubectx-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\kubectx-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 kubectx from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/kubens/install.ps1 b/kubens/install.ps1 index 4009b0e..94beed4 100644 --- a/kubens/install.ps1 +++ b/kubens/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\kubens-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\kubens-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 kubens from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/lf/install.ps1 b/lf/install.ps1 index 040a1fa..d9669d0 100644 --- a/lf/install.ps1 +++ b/lf/install.ps1 @@ -14,10 +14,10 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\lf-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\lf-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 lf from $Env:WEBI_PKG_URL to $pkg_download" & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part" diff --git a/lsd/install.ps1 b/lsd/install.ps1 index 177f47f..60f18d7 100644 --- a/lsd/install.ps1 +++ b/lsd/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\lsd-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\lsd-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 lsd from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/mutagen/install.ps1 b/mutagen/install.ps1 index 25e9ba9..557426d 100644 --- a/mutagen/install.ps1 +++ b/mutagen/install.ps1 @@ -14,10 +14,10 @@ $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" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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" diff --git a/node/install.ps1 b/node/install.ps1 index 0d475fc..f8b55ca 100644 --- a/node/install.ps1 +++ b/node/install.ps1 @@ -1,13 +1,13 @@ #!/usr/bin/env pwsh # 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 $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")) @@ -23,8 +23,8 @@ IF (!(Test-Path -Path "$Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERS # 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" + 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" diff --git a/pandoc/install.ps1 b/pandoc/install.ps1 index fdbd92e..faab895 100644 --- a/pandoc/install.ps1 +++ b/pandoc/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\pandoc-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\pandoc-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 pandoc from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/rclone/install.ps1 b/rclone/install.ps1 index 6756403..ce9b08a 100644 --- a/rclone/install.ps1 +++ b/rclone/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\rclone-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\rclone-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 rclone from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/rg/install.ps1 b/rg/install.ps1 index d0642e2..3e8bf67 100644 --- a/rg/install.ps1 +++ b/rg/install.ps1 @@ -15,11 +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" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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" diff --git a/sass/install.ps1 b/sass/install.ps1 index e7bd322..0f6c08a 100644 --- a/sass/install.ps1 +++ b/sass/install.ps1 @@ -17,10 +17,10 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\dart-sass-v$Env:WEBI_VERSION" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\dart-sass-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_dir" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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")) { # TODO: arch detection echo "Downloading sass (dart-sass) from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/sclient/install.ps1 b/sclient/install.ps1 index 9eba462..40b5482 100644 --- a/sclient/install.ps1 +++ b/sclient/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\sclient-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\sclient-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 sclient from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/sd/install.ps1 b/sd/install.ps1 index 751f766..0787e4c 100644 --- a/sd/install.ps1 +++ b/sd/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\sd-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\sd-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 sd from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/serviceman/install.ps1 b/serviceman/install.ps1 index 599b615..6ab3b44 100644 --- a/serviceman/install.ps1 +++ b/serviceman/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\serviceman-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\serviceman-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 serviceman from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/shellcheck/install.ps1 b/shellcheck/install.ps1 index 610d2d5..e8f8ab7 100644 --- a/shellcheck/install.ps1 +++ b/shellcheck/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\shellcheck-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\shellcheck-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 shellcheck from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/shfmt/install.ps1 b/shfmt/install.ps1 index 427b881..5811886 100644 --- a/shfmt/install.ps1 +++ b/shfmt/install.ps1 @@ -14,10 +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" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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" diff --git a/syncthing/install.ps1 b/syncthing/install.ps1 index f1d8286..af5f04a 100644 --- a/syncthing/install.ps1 +++ b/syncthing/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\syncthing-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\syncthing-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 syncthing from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/watchexec/install.ps1 b/watchexec/install.ps1 index 5df25ad..3f94076 100644 --- a/watchexec/install.ps1 +++ b/watchexec/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\watchexec-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\watchexec-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 watchexec from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/wsl.bak/install.ps1 b/wsl.bak/install.ps1 index 23c3ba9..f255d97 100644 --- a/wsl.bak/install.ps1 +++ b/wsl.bak/install.ps1 @@ -1,7 +1,7 @@ #!/usr/bin/env pwsh -curl.exe -s "https://wslstorestorage.blob.core.windows.net/wslblob/wsl_update_x64.msi" -o "$Env:USERPROFILE\Downloads\wsl_update_x64.msi" -msiexec /a "$Env:USERPROFILE\Downloads\wsl_update_x64.msi" /qb TARGETDIR="C:\temp" +curl.exe -s "https://wslstorestorage.blob.core.windows.net/wslblob/wsl_update_x64.msi" -o "$Env:USERPROFILE\Downloads\webi\wsl_update_x64.msi" +msiexec /a "$Env:USERPROFILE\Downloads\webi\wsl_update_x64.msi" /qb TARGETDIR="C:\temp" copy C:\temp\System32\lxss\tools\kernel C:\Windows\System32\lxss\tools\ dism.exe /online /enable-feature /featurename:VirtualMachinePlatform /all /norestart diff --git a/wsl/install.ps1 b/wsl/install.ps1 index 849ead4..5972528 100644 --- a/wsl/install.ps1 +++ b/wsl/install.ps1 @@ -28,13 +28,13 @@ IF(!(Test-CommandExists wsl)) } echo "" -IF ((Test-Path -Path "$Env:UserProfile\Downloads\Ubuntu_2004_x64.appx" )) { +IF ((Test-Path -Path "$Env:UserProfile\Downloads\webi\Ubuntu_2004_x64.appx" )) { echo "Skipping 4 of 5: Ubuntu Linux 20.04 already installed" } ELSE { echo "Installing 4 of 5 Ubuntu Linux 20.04 (for WSL 1 and WSL 2) ..." - curl.exe -fL -o "$Env:UserProfile\Downloads\Ubuntu_2004_x64.appx.part" https://aka.ms/wslubuntu2004 - & move "$Env:UserProfile\Downloads\Ubuntu_2004_x64.appx.part" "$Env:UserProfile\Downloads\Ubuntu_2004_x64.appx" - Add-AppxPackage "$Env:UserProfile\Downloads\Ubuntu_2004_x64.appx" + curl.exe -fL -o "$Env:UserProfile\Downloads\webi\Ubuntu_2004_x64.appx.part" https://aka.ms/wslubuntu2004 + & move "$Env:UserProfile\Downloads\webi\Ubuntu_2004_x64.appx.part" "$Env:UserProfile\Downloads\webi\Ubuntu_2004_x64.appx" + Add-AppxPackage "$Env:UserProfile\Downloads\webi\Ubuntu_2004_x64.appx" } echo "" diff --git a/xz/install.ps1 b/xz/install.ps1 index 8129114..e054e49 100644 --- a/xz/install.ps1 +++ b/xz/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\xz-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\xz-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 xz from $Env:WEBI_PKG_URL to $pkg_download" diff --git a/yq/install.ps1 b/yq/install.ps1 index 98c69f2..94b989c 100644 --- a/yq/install.ps1 +++ b/yq/install.ps1 @@ -10,10 +10,10 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\yq-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\yq-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 yq from $Env:WEBI_PKG_URL to $pkg_download" & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part" diff --git a/zoxide/install.ps1 b/zoxide/install.ps1 index ac76bff..1fc0814 100644 --- a/zoxide/install.ps1 +++ b/zoxide/install.ps1 @@ -15,11 +15,11 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\zoxide-v$Env:WEBI_VERSION\bin" $pkg_src_dir = "$Env:USERPROFILE\.local\opt\zoxide-v$Env:WEBI_VERSION" $pkg_src = "$pkg_src_cmd" -New-Item "$Env:USERPROFILE\Downloads" -ItemType Directory -Force | out-null -$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 Write-Output "Downloading zoxide from $Env:WEBI_PKG_URL to $pkg_download" & curl.exe -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part" -- 2.25.1