From 64a36b38cea1903fb6d3f65e20683f61c546cd15 Mon Sep 17 00:00:00 2001
From: "Ethan N. Paul" <enpaul@omni.enpaul.net>
Date: Mon, 29 Jan 2018 10:29:15 -0500
Subject: [PATCH] Modified powershell deploy script to properly sanititze
 output

---
 .ci-dev.ps1     | 15 ++++++++++-----
 .ci-release.ps1 | 16 +++++++++++-----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/.ci-dev.ps1 b/.ci-dev.ps1
index baa9ca3..0a1dc94 100644
--- a/.ci-dev.ps1
+++ b/.ci-dev.ps1
@@ -12,9 +12,9 @@ if (Test-Path "C:\inetpub\wwwroot\build-tmp.enpaul-dev\.git") {
 if (Test-Path "C:\inetpub\wwwroot\build-tmp.enpaul-dev\.gitlab-ci.yml") {
   Remove-Item -Path "C:\inetpub\wwwroot\build-tmp.enpaul-dev\.gitlab-ci.yml" -Force
 }
-if (Test-Path "C:\inetpub\wwwroot\build-tmp.enpaul-dev\deploy.ps1") {
-  Remove-Item -Path "C:\inetpub\wwwroot\build-tmp.enpaul-dev\deploy.ps1" -Force
-}
+
+Remove-Item -Path "C:\inetpub\wwwroot\build-tmp.enpaul-dev\*.ps1" -Force
+
 if (Test-Path "C:\inetpub\wwwroot\build-tmp.enpaul-dev\.gitignore") {
   Remove-Item -Path "C:\inetpub\wwwroot\build-tmp.enpaul-dev\.gitignore" -Force
 }
@@ -22,8 +22,13 @@ if (Test-Path "C:\inetpub\wwwroot\build-tmp.enpaul-dev\.htaccess") {
   Remove-Item -Path "C:\inetpub\wwwroot\build-tmp.enpaul-dev\.htaccess" -Force
 }
 
-Rename-Item -Path "C:\inetpub\wwwroot\enpaul-dev" -NewName "enpaul-dev.old" -Force
+if (Test-Path "C:\inetpub\wwwroot\enpaul-dev") {
+  Rename-Item -Path "C:\inetpub\wwwroot\enpaul-dev" -NewName "enpaul-dev.old" -Force
+}
+
 Rename-Item -Path "C:\inetpub\wwwroot\build-tmp.enpaul-dev" -NewName "enpaul-dev" -Force
 
-Remove-Item -path "C:\inetpub\wwwroot\enpaul-dev.old" -Recurse -Force
+if (Test-Path "C:\inetpub\wwwroot\enpaul-dev.old") {
+  Remove-Item -path "C:\inetpub\wwwroot\enpaul-dev.old" -Recurse -Force
+}
 exit
diff --git a/.ci-release.ps1 b/.ci-release.ps1
index 3cc2816..96bb8ee 100644
--- a/.ci-release.ps1
+++ b/.ci-release.ps1
@@ -12,9 +12,9 @@ if (Test-Path "C:\inetpub\wwwroot\tmp-build.enpaul\.git") {
 if (Test-Path "C:\inetpub\wwwroot\tmp-build.enpaul\.gitlab-ci.yml") {
   Remove-Item -Path "C:\inetpub\wwwroot\tmp-build.enpaul\.gitlab-ci.yml" -Force
 }
-if (Test-Path "C:\inetpub\wwwroot\tmp-build.enpaul\deploy.ps1") {
-  Remove-Item -Path "C:\inetpub\wwwroot\tmp-build.enpaul\deploy.ps1" -Force
-}
+
+Remove-Item -Path "C:\inetpub\wwwroot\tmp-build.enpaul\*.ps1" -Force
+
 if (Test-Path "C:\inetpub\wwwroot\tmp-build.enpaul\.gitignore") {
   Remove-Item -Path "C:\inetpub\wwwroot\tmp-build.enpaul\.gitignore" -Force
 }
@@ -22,8 +22,14 @@ if (Test-Path "C:\inetpub\wwwroot\tmp-build.enpaul\.htaccess") {
   Remove-Item -Path "C:\inetpub\wwwroot\tmp-build.enpaul\.htaccess" -Force
 }
 
-Rename-Item -Path "C:\inetpub\wwwroot\enpaul" -NewName "enpaul.old" -Force
+if (Test-Path "C:\inetpub\wwwroot\enpaul")
+  Rename-Item -Path "C:\inetpub\wwwroot\enpaul" -NewName "enpaul.old" -Force
+}
+
 Rename-Item -Path "C:\inetpub\wwwroot\tmp-build.enpaul" -NewName "enpaul" -Force
 
-Remove-Item -path "C:\inetpub\wwwroot\enpaul.old" -Recurse -Force
+if (Test-Path "C:\inetpub\wwwroot\enpaul.old") {
+  Remove-Item -path "C:\inetpub\wwwroot\enpaul.old" -Recurse -Force
+}
+
 exit