Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-20 22:00:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

use different path for installer files

Browse Source
This commit is contained in:
psychobunny
2016-12-22 11:45:22 -05:00
parent f505b47ac9
commit 66d8c29d25
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -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

16
install/web.js
View File

@@ -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;

4
src/views/install/index.tpl
View File

@@ -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>