Fixed install script (bis)
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
/.idea
|
/.idea
|
||||||
/node_modules
|
/node_modules
|
||||||
/config.json
|
/config.json
|
||||||
|
/config.example.json
|
||||||
/data
|
/data
|
||||||
@@ -57,7 +57,7 @@ then edit the config.json file with your values :
|
|||||||
**3. Start your server**
|
**3. Start your server**
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npm start
|
npm run
|
||||||
#or
|
#or
|
||||||
node src/server.js
|
node src/server.js
|
||||||
```
|
```
|
||||||
|
|||||||
Generated
+183
-208
File diff suppressed because it is too large
Load Diff
+4
-1
@@ -1,4 +1,5 @@
|
|||||||
{
|
{
|
||||||
|
"nodePort": 5000,
|
||||||
"name": "gitblog.md",
|
"name": "gitblog.md",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"description": "A static blog using Markdown pulled from your git repository.",
|
"description": "A static blog using Markdown pulled from your git repository.",
|
||||||
@@ -7,6 +8,7 @@
|
|||||||
"express": "^4.17.1",
|
"express": "^4.17.1",
|
||||||
"ncp": "^2.0.0",
|
"ncp": "^2.0.0",
|
||||||
"showdown": "^1.9.0",
|
"showdown": "^1.9.0",
|
||||||
|
"shx": "^0.3.2",
|
||||||
"xml": "^1.0.1"
|
"xml": "^1.0.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
@@ -17,8 +19,9 @@
|
|||||||
"supertest": "^4.0.2"
|
"supertest": "^4.0.2"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
"start": "node src/server.js",
|
||||||
"test": "jest",
|
"test": "jest",
|
||||||
"install": "node src/postinstall.js"
|
"install": "shx mkdir -p ./data/$(date +%Y)/$(date +%m)/$(date +%d)/ && shx cp -rf ./sample_data/* ./data/$(date +%Y)/$(date +%m)/$(date +%d) && shx cp -f ./src/default_config.json ./config.example.json"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
const refConfig = require('./default_config.json');
|
||||||
|
const srcConfig = require('../config.json');
|
||||||
|
|
||||||
|
const merge = function (ref, src) {
|
||||||
|
if (typeof ref !== typeof src) {
|
||||||
|
return ref;
|
||||||
|
} else if (typeof ref === 'object') {
|
||||||
|
const out = {};
|
||||||
|
Object.keys(ref).forEach(key => out[key] = merge(ref[key], src[key]));
|
||||||
|
return out;
|
||||||
|
} else {
|
||||||
|
return src;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = merge(refConfig, srcConfig);
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
const fs = require('fs');
|
|
||||||
const ncp = require('ncp').ncp;
|
|
||||||
|
|
||||||
const pad0 = n => ('0'+n).substr(-2);
|
|
||||||
|
|
||||||
const datetime = new Date();
|
|
||||||
const dir = `./data/${datetime.getFullYear()}/${pad0(datetime.getMonth())}/${pad0(datetime.getDay())}/`;
|
|
||||||
|
|
||||||
if (!fs.existsSync(dir)) {
|
|
||||||
fs.mkdirSync(dir, {recursive: true});
|
|
||||||
}
|
|
||||||
|
|
||||||
ncp('./sample_data/',dir, function(err){
|
|
||||||
if(err)
|
|
||||||
console.error(err);
|
|
||||||
else
|
|
||||||
console.log(`sample data copied to ${dir}`);
|
|
||||||
});
|
|
||||||
+3
-5
@@ -1,9 +1,7 @@
|
|||||||
const config = require('../config.json');
|
const config = require('./config');
|
||||||
const app = require('./app')(config);
|
const app = require('./app')(config);
|
||||||
|
|
||||||
const port = config.nodePort|3000;
|
app.listen(config.nodePort, () => {
|
||||||
|
console.log(`gitblog.md server listening on port ${config.nodePort}`);
|
||||||
app.listen(config.nodePort|3000, () => {
|
|
||||||
console.log(`gitblog.md server listening on port ${port}`);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user