refactor: finish moving ssh-* scripts to own installers

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

diff --git a/keypairs/install.ps1 b/keypairs/install.ps1
index fcfa2b12b85d7fbf500d0e9dbf51ff901a6e3af2..8c15983461a01cab30766b6ed2d5ac17b347be6e 100644 (file)
--- a/keypairs/install.ps1
+++ b/keypairs/install.ps1
@@ -15,10 +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"
 
-$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"
@@ -45,7 +46,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 ".\keypairs.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
+Remove-Item -Path "$pkg_dst_cmd" -Recurse -ErrorAction Ignore | out-null
 Copy-Item -Path "$pkg_src" -Destination "$pkg_dst" -Recurse