From 4d8ea54ea43841a2de7750daf6a9fb68bfe1dd06 Mon Sep 17 00:00:00 2001
From: Alex Hirsch <w4rh4wk@bluephoenix.at>
Date: Thu, 20 Aug 2015 22:45:06 +0200
Subject: [PATCH] merge sysinternals installer

---
 scripts/install-basic-software.ps1 |  9 +++++++++
 scripts/install-sysinternals.ps1   | 20 --------------------
 2 files changed, 9 insertions(+), 20 deletions(-)
 delete mode 100644 scripts/install-sysinternals.ps1

diff --git a/scripts/install-basic-software.ps1 b/scripts/install-basic-software.ps1
index 4a8cdb7..c2b5fba 100644
--- a/scripts/install-basic-software.ps1
+++ b/scripts/install-basic-software.ps1
@@ -33,3 +33,12 @@ Get-PackageProvider -Name chocolatey -Force
 
 echo "Installing Packages"
 Install-Package -Name $packages -Force
+
+echo "Installing Sysinternals to C:\Sysinternals"
+$download_uri = "https://download.sysinternals.com/files/SysinternalsSuite.zip"
+$wc = new-object net.webclient
+$wc.DownloadFile($download_uri, "/SysinternalsSuite.zip")
+Add-Type -AssemblyName "system.io.compression.filesystem"
+[io.compression.zipfile]::ExtractToDirectory("/SysinternalsSuite.zip", "/Sysinternals")
+echo "Removing zipfile"
+rm "/SysinternalsSuite.zip"
diff --git a/scripts/install-sysinternals.ps1 b/scripts/install-sysinternals.ps1
deleted file mode 100644
index 634c366..0000000
--- a/scripts/install-sysinternals.ps1
+++ /dev/null
@@ -1,20 +0,0 @@
-#   Description:
-# This script installs the sysinternals suit into your default drive's root
-# directory.
-
-$ErrorActionPreference = "Stop"
-
-$download_uri = "https://download.sysinternals.com/files/SysinternalsSuite.zip"
-
-echo "Downloading SysinternalsSuite zipfile"
-
-# TODO replace this with wget when it works again on a clean install
-$wc = new-object net.webclient
-$wc.DownloadFile($download_uri, "/SysinternalsSuite.zip")
-
-echo "Extracting SysinternalsSuite zipfile"
-Add-Type -AssemblyName "system.io.compression.filesystem"
-[io.compression.zipfile]::ExtractToDirectory("/SysinternalsSuite.zip", "/Sysinternals")
-
-echo "Removing zipfile"
-rm "/SysinternalsSuite.zip"