X-Git-Url: https://git.josue.xyz/?a=blobdiff_plain;f=caddy%2Finstall.ps1;h=3b33d3abcd57c442c7cc3c3713fa2f30fe01ae31;hb=91512157ab426c87e0a82b594620e90e324b23a3;hp=76de03a8222f0412a74e21001bd6873cdbd5e207;hpb=46445e9382905a52e770d44191235be179616049;p=webi-installers%2F.git

diff --git a/caddy/install.ps1 b/caddy/install.ps1
index 76de03a..3b33d3a 100644
--- a/caddy/install.ps1
+++ b/caddy/install.ps1
@@ -16,10 +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"
 
-$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"
@@ -44,7 +45,7 @@ IF (!(Test-Path -Path "$pkg_src_cmd")) {
 
     # 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 ".\caddy.exe" -Destination "$pkg_src_bin"
 
     # Exit tmp
@@ -53,5 +54,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 | out-null
-New-Item "$pkg_dst_bin" -ItemType Directory -Force
+New-Item "$pkg_dst_bin" -ItemType Directory -Force | out-null
 Copy-Item -Path "$pkg_src" -Destination "$pkg_dst" -Recurse