ppackage 2.3.0 → 2.3.3

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

@@ -163,7 +163,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)) {
@@ -177,7 +177,7 @@ class ppackage {
     restore =  restore.map(v => v.trim()).filter(v => v && v[0] != "#");
 
     for(let line of restore)
-      await passthru("git", ["restore", line]).catch(()=>{});
+      await passthru("git", ["checkout", "--", line]).catch(()=>{});
   }
 
 
@@ -185,13 +185,17 @@ class ppackage {
   // yet, this is broader
 
   static _git_to_https(repository_url) {
-    const SSH_MASK = /^git@/;
-    if(!SSH_MASK.test(repository_url))
-      return repository_url;
 
-    return repository_url = repository_url
-      .replace(/:/g, "/")
-      .replace(SSH_MASK, "https://");
+    const SSH_MASK = new RegExp("^git@([^:]+):(.*)");
+    if(SSH_MASK.test(repository_url))
+      return repository_url.replace(SSH_MASK, "https://$1/$2");
+
+    // git+ssh://git@github.com/131/ppackage.git
+    const GIT_SSH_MASK = new RegExp("^git\\+ssh://git@([^/]+)/(.*)");
+    if(GIT_SSH_MASK.test(repository_url))
+      return repository_url.replace(GIT_SSH_MASK, "https://$1/$2");
+
+    return repository_url;
   }
 
   async _find_repo() {

package/package.json

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