Skip to content

Commit 734c892

Browse files
committed
Fixed cli bug
1 parent bf66f4c commit 734c892

File tree

3 files changed

+21
-18
lines changed

3 files changed

+21
-18
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ npm run build-api-doc
134134
**Run cli during development:**
135135

136136
```bash
137-
npm run cli -- -d ./examples/watchDir/dir1
137+
npm run emap -- -d ./examples/watchDir/dir1
138138
```
139139

140140
**Run examples:**

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "mapfile-ejs",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
44
"description": "Allows you to use Embedded JavaScript (EJS) into MapServer Mapfiles.",
55
"main": "index.js",
66
"bin": {
7-
"emap": "src/cli.js"
7+
"emap": "src/emap.js"
88
},
99
"dependencies": {
1010
"chokidar": "^2.0.4",
@@ -17,7 +17,7 @@
1717
},
1818
"scripts": {
1919
"build-api-doc": "documentation build src/** --output docs/api --format html --watch",
20-
"cli": "node src/cli.js"
20+
"emap": "node src/emap.js"
2121
},
2222
"repository": {
2323
"type": "git",

src/cli.js renamed to src/emap.js

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,51 +43,54 @@ program.on(`--help`, function() {
4343
});
4444

4545
// header
46-
console.log(`###################################################`);
47-
console.log(
48-
`## ${packageJson.name} v${packageJson.version} #############################`
49-
);
50-
console.log(`###################################################`);
46+
let msg = `###################################################
47+
## ${packageJson.name} v${packageJson.version} #############################
48+
###################################################
49+
`;
5150

5251
// parse arguments
5352
program.parse(process.argv);
5453

5554
// set directory
5655
if (!program.directory) {
5756
program.directory = path.resolve(`.`);
58-
}else{
57+
} else {
5958
program.directory = path.resolve(program.directory);
6059
console.log(path.resolve(program.directory));
6160
}
62-
console.log(` Watching at ${program.directory}`);
61+
msg += ` Watching at ${program.directory}\n`;
6362

6463
// set input encoding
6564
if (!program.inputEncoding) {
6665
program.inputEncoding = `utf8`;
6766
}
68-
console.log(` Input encoding: ${program.inputEncoding}`);
67+
msg += ` Input encoding: ${program.inputEncoding}\n`;
6968

7069
// set output encoding
7170
if (!program.outputEncoding) {
7271
program.outputEncoding = `utf8`;
7372
}
74-
console.log(` Output encoding: ${program.outputEncoding}`);
73+
msg += ` Output encoding: ${program.outputEncoding}\n`;
7574

7675
// set no rendering on start
7776
if (!program.ignoreInitial) {
7877
program.ignoreInitial = false;
7978
}
80-
console.log(` Ignore rendering on initial: ${program.ignoreInitial}`);
79+
msg += ` Ignore rendering on initial: ${program.ignoreInitial}\n`;
8180

8281
if (!program.eFiles) {
8382
program.eFiles = false;
8483
}
85-
console.log(` Render all e files: ${program.eFiles}`);
84+
msg += ` Render all e files: ${program.eFiles}\n`;
8685

8786
// footer
88-
console.log(`###################################################`);
89-
console.log(`## Stop watching with Ctrl+C ######################`);
90-
console.log(`###################################################`);
87+
msg += `###################################################
88+
## Stop watching with Ctrl+C ######################
89+
###################################################
90+
`;
91+
92+
// log message
93+
console.log(msg);
9194

9295
// watch and render
9396
watch(program.directory, {

0 commit comments

Comments
 (0)