ppackage 2.3.1 → 2.3.4

package/bin/askpass

@@ -1,4 +1,4 @@
-#!/usr/bin/node
+#!/usr/bin/env node
 
 let response, [,, what] = process.argv;
 if(/Username/.test(what))

package/index.js

@@ -8,6 +8,7 @@ const {spawn} = require('child_process');
 const args = require('nyks/process/parseArgs')();
 const passthru = require('nyks/child_process/passthru');
 const wait = require('nyks/child_process/wait');
+const trim = require('mout/string/trim');
 
 const Dockerfile = require('./lib/dockerfile');
 const {Parser, Composer} = require('yaml');
@@ -163,7 +164,7 @@ class ppackage {
     await passthru("git", ["reset", "HEAD", "--", "."]);
 
     for(let line of [GITIGNORE_PATH, DOCKERIGNORE_PATH, NPMIGNORE_PATH])
-      await passthru("git", ["restore", line]).catch(()=>{});
+      await passthru("git", ["checkout", "--", line]).catch(()=>{});
 
     let restore = [];
     if(fs.existsSync(DOCKERIGNORE_PATH)) {
@@ -174,10 +175,10 @@ class ppackage {
       let ignore = fs.readFileSync(NPMIGNORE_PATH, 'utf8');
       restore.push(...ignore.split("\n"));
     }
-    restore =  restore.map(v => v.trim()).filter(v => v && v[0] != "#");
+    restore =  restore.map(v => trim(v.trim(), '/')).filter(v => v && v[0] != "#");
 
     for(let line of restore)
-      await passthru("git", ["restore", line]).catch(()=>{});
+      await passthru("git", ["checkout", "--", line]).catch(()=>{});
   }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ppackage",
-  "version": "2.3.1",
+  "version": "2.3.4",
   "description": "",
   "main": "index.js",
   "bin": {