Merge pull request #15 from StatelessSoftware/v0.1.1

V0.1.1

Author: DrewImm

CHANGELOG.md

@@ -1,5 +1,12 @@
 # html-baker
 
+## [0.1.1] - 2018-04-03
+
+### Fixes
+
+- [Issue #14] - Bake fails with eternallybored's wget for Windows
+- [Issue #12] - Doesn't properly kill server
+
 ## [0.1.0] - 2018-03-31
 
 ### Additions

index.js

@@ -50,20 +50,19 @@ if (config.input && config.input.directory && config.input.runcmd) {
     server.stdout.on("data", (data) => {
         serverStarted = true;
         download();
+        server.kill();
     });
     server.stderr.on("data", (data) => {
         console.log(`Server Error: ${data}`);
-        process.kill();
+        server.kill();
     });
     server.on("close", (code) => {
         console.log(`Server exited with code ${code}`);
-        serverStarted = false;
-        process.kill();
+        process.exit();
     })
     server.on("exit", (code) => {
         console.log(`Server exited with code ${code}`);
-        serverStarted = false;
-        process.kill();
+        process.exit();
     })
 
 }
@@ -114,7 +113,13 @@ function download() {
         console.log("Running " + wgetcmd);
 
         try {
-            shell.execSync(wgetcmd);
+
+            try {
+                shell.execSync(wgetcmd);
+            }
+            catch (ex) {
+                console.log("Wget exited unexpectedly.  Please check output before committing.");
+            }
 
             // Run the post command
             if (config.postcmd && config.postcmd.length) {
@@ -154,10 +159,5 @@ function download() {
         // Server not started
         console.log("Server wasn't started.");
     }
-
-    if (server) {
-        server.kill();
-    }
-    process.exit();
 
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "html-baker",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Convert websites into flat-file websites",
   "main": "index.js",
   "bin": {