Fix paths to resolve from process location, update npm instructions

README.md

@@ -5,7 +5,7 @@ Render Html to PDFs using [Vivliostyle.js](https://github.com/vivliostyle/vivlio
 ## Installation
 
 ```
-npm install -g https://gitlab.coko.foundation/fchasen/vivliostyle-electron.git
+npm install -g git+ssh://git@gitlab.coko.foundation:fchasen/vivliostyle-electron.git
 ```
 
 ## Generating a PDF

cli.js

@@ -21,9 +21,10 @@ program
   .parse(process.argv);
 
 var input = program.inputs || program.args[0];
-var relativePath = path.relative(__dirname, input);
+var dir = process.cwd();
+var relativePath = path.resolve(dir, input);
 
-var output = program.output || './' + path.basename(input).replace('.xhtml', '.pdf').replace('.html', '.pdf');
+var output = program.output ? path.resolve(dir, program.output) : './' + path.basename(input).replace('.xhtml', '.pdf').replace('.html', '.pdf');
 
 var render;
 
@@ -31,6 +32,9 @@ var hyphenate;
 
 var tmpPath;
 
+if (path.extname(relativePath) != ('.html' || '.xhtml')) {
+  return console.error("Must pass a html or xhtml file as input");
+}
 
 if (program.hyphenate) {
   tmpPath = relativePath.replace(".xhtml", ".hyphenated.xhtml").replace(".html", ".hyphenated.html");
@@ -47,7 +51,7 @@ renderer = new Renderer(tmpPath || input, output, {
   height: program.height,
   debug: program.debug
 }).then(function (result) {
-  if (tmpPath) {
+  if (tmpPath && tmpPath != relativePath) {
     fs.unlinkSync(tmpPath);
   }
 }).catch(function (err) {