refactor: finish moving ssh-* scripts to own installers

[webi-installers/.git] / sd / install.ps1

diff --git a/sd/install.ps1 b/sd/install.ps1
index 3f3e6f0096184d1ed8f00b2a6d62e0c61e5bdfc5..0787e4c32875bc61e206a8f92c30b0631d713bba 100644 (file)
--- a/sd/install.ps1
+++ b/sd/install.ps1
@@ -15,10 +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"
 
-$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"
@@ -42,16 +43,16 @@ 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 "b\*\release\sd.exe" -Destination "$pkg_src_bin"
     # Exit tmp
     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