From b816e7f4db43fcf9b28e574f283768ff19f48c8e Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Fri, 7 Mar 2014 12:09:30 +0100
Subject: [PATCH] Fixes: sites cannot run the new installer if they have
 /install directory

---
 src/Umbraco.Web.UI/config/ClientDependency.config | 2 +-
 src/Umbraco.Web/Install/InstallHelper.cs          | 9 ++++++++-
 src/Umbraco.Web/WebBootManager.cs                 | 3 +++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config
index e09251e424..d26bfe176a 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 --> 
-<clientDependency version="394389720" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
+<clientDependency version="1469612626" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
 
   <!-- 
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
diff --git a/src/Umbraco.Web/Install/InstallHelper.cs b/src/Umbraco.Web/Install/InstallHelper.cs
index af953292a2..9fbf29bb41 100644
--- a/src/Umbraco.Web/Install/InstallHelper.cs
+++ b/src/Umbraco.Web/Install/InstallHelper.cs
@@ -2,13 +2,14 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Configuration;
+using System.IO;
 using System.Linq;
 using System.Web;
 using System.Web.Script.Serialization;
 using System.Web.UI;
-
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
 using Umbraco.Core.Persistence;
 using Umbraco.Web.Install.InstallSteps;
 using Umbraco.Web.Install.Models;
@@ -65,6 +66,12 @@ namespace Umbraco.Web.Install
             return _installationType ?? (_installationType = IsBrandNewInstall ? InstallationType.NewInstall : InstallationType.Upgrade).Value;
         }
 
+        internal void DeleteLegacyInstaller()
+        {
+            if(Directory.Exists( IOHelper.MapPath( SystemDirectories.Install )))
+                Directory.Move(IOHelper.MapPath(SystemDirectories.Install), IOHelper.MapPath("~/app_data/temp/install_backup"));
+        }
+
         /// <summary>
         /// Checks if this is a brand new install meaning that there is no configured version and there is no configured database connection
         /// </summary>
diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs
index ab31fba02d..65112efce7 100644
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -103,6 +103,9 @@ namespace Umbraco.Web
             renderer.Initialize("Umbraco.DependencyPathRenderer", new NameValueCollection { { "compositeFileHandlerPath", "~/DependencyHandler.axd" } });
             ClientDependencySettings.Instance.MvcRendererCollection.Add(renderer);
 
+            InstallHelper insHelper = new InstallHelper(UmbracoContext.Current);
+            insHelper.DeleteLegacyInstaller();
+
             return this;
         }