From bf93d258acf813725a60ecca3af56c0983eaa53a Mon Sep 17 00:00:00 2001
From: Alex Hirsch <w4rh4wk@bluephoenix.at>
Date: Sun, 16 Aug 2015 19:48:17 +0200
Subject: [PATCH] merge lockscreen scripts

---
 scripts/disable-logon-background.ps1 | 10 ----------
 scripts/disable-new-lockscreen.ps1   | 10 ----------
 scripts/optimize-lockscreen.ps1      | 17 +++++++++++++++++
 3 files changed, 17 insertions(+), 20 deletions(-)
 create mode 100644 scripts/optimize-lockscreen.ps1

diff --git a/scripts/disable-logon-background.ps1 b/scripts/disable-logon-background.ps1
index 46e3ab4..e69de29 100644
--- a/scripts/disable-logon-background.ps1
+++ b/scripts/disable-logon-background.ps1
@@ -1,10 +0,0 @@
-#   Description:
-# This script will disable the login screen background image.
-
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\reg-helper.psm1
-
-echo "Disabling login screen background image"
-Import-Registry(@"
-[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\System]
-"DisableLogonBackgroundImage"=dword:00000001
-"@)
diff --git a/scripts/disable-new-lockscreen.ps1 b/scripts/disable-new-lockscreen.ps1
index 80ec062..e69de29 100644
--- a/scripts/disable-new-lockscreen.ps1
+++ b/scripts/disable-new-lockscreen.ps1
@@ -1,10 +0,0 @@
-#   Description:
-# This script disables the new lock screen via Group Policies.
-
-Import-Module -DisableNameChecking $PSScriptRoot\..\lib\reg-helper.psm1
-
-echo "Disabling new lock screen"
-Import-Registry(@"
-[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Personalization]
-"NoLockScreen"=dword:00000001
-"@)
diff --git a/scripts/optimize-lockscreen.ps1 b/scripts/optimize-lockscreen.ps1
new file mode 100644
index 0000000..9fef125
--- /dev/null
+++ b/scripts/optimize-lockscreen.ps1
@@ -0,0 +1,17 @@
+#   Description:
+# This script disables the new lock screen and login screen background
+# image.
+
+Import-Module -DisableNameChecking $PSScriptRoot\..\lib\reg-helper.psm1
+
+echo "Disabling login screen background image"
+Import-Registry(@"
+[HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\System]
+"DisableLogonBackgroundImage"=dword:00000001
+"@)
+
+echo "Disabling new lock screen"
+Import-Registry(@"
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Personalization]
+"NoLockScreen"=dword:00000001
+"@)