From 66d8c29d251231585986f72d30cd9b8d59ed92b3 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Thu, 22 Dec 2016 11:45:22 -0500
Subject: [PATCH] use different path for installer files

---
 .gitignore                  |  2 ++
 install/web.js              | 16 ++++++++++++----
 src/views/install/index.tpl |  4 ++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index dbfdf011d6..e744e31036 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,8 @@ pidfile
 /public/nodebb.min.js.map
 /public/acp.min.js
 /public/acp.min.js.map
+/public/installer.css
+/public/installer.min.js
 
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
 *.iml
diff --git a/install/web.js b/install/web.js
index b81fdeb545..1bac1577d0 100644
--- a/install/web.js
+++ b/install/web.js
@@ -118,9 +118,17 @@ function launch(req, res) {
 	process.stdout.write('    "./nodebb log" to view server output\n');
 	process.stdout.write('    "./nodebb restart" to restart NodeBB\n');
 
-	child.unref();
-	process.exit(0);
+	async.parallel([
+		async.apply(fs.unlink(path.join(__dirname, '../public/installer.css'))),
+		async.apply(fs.unlink(path.join(__dirname, '../public/installer.min.js')))	
+	], function (err) {
+		if (err) {
+			winston.warn('Unable to remove installer files');
+		}
 
+		child.unref();
+		process.exit(0);
+	});
 }
 
 function compileLess(callback) {
@@ -134,7 +142,7 @@ function compileLess(callback) {
 				return winston.error('Unable to compile LESS: ', err);
 			}
 
-			fs.writeFile(path.join(__dirname, '../public/stylesheet.css'), css.css, callback);
+			fs.writeFile(path.join(__dirname, '../public/installer.css'), css.css, callback);
 		});
 	});
 }
@@ -146,7 +154,7 @@ function compileJS(callback) {
 	}));
 
 
-	fs.writeFile(path.join(__dirname, '../public/nodebb.min.js'), result.code, callback);
+	fs.writeFile(path.join(__dirname, '../public/installer.min.js'), result.code, callback);
 }
 
 module.exports = web;
\ No newline at end of file
diff --git a/src/views/install/index.tpl b/src/views/install/index.tpl
index f960c70440..b7971f23fd 100644
--- a/src/views/install/index.tpl
+++ b/src/views/install/index.tpl
@@ -9,7 +9,7 @@
 	<link rel="stylesheet" type="text/css" href="https://bootswatch.com/united/bootstrap.min.css">
 	<link href='https://fonts.googleapis.com/css?family=Roboto:400,300,500,700' rel='stylesheet' type='text/css'>
 	<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
-	<link rel="stylesheet" type="text/css" href="stylesheet.css">
+	<link rel="stylesheet" type="text/css" href="installer.css">
 
 </head>
 
@@ -134,6 +134,6 @@
 
 	<script src="//code.jquery.com/jquery-1.11.2.min.js"></script>
 	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
-	<script type="text/javascript" src="nodebb.min.js"></script>
+	<script type="text/javascript" src="installer.min.js"></script>
 </body>
 </html>
\ No newline at end of file