save file

Author: javascript-2020

utils/misc/nodejs-terminal/v2.0/nodejs-terminal-v2.0.html

@@ -280,10 +280,9 @@
 
         var term;
         var shell;
-        var cwd;
         var user_dir;
-        var cwd_initial;
         var cwd_abs;
+        var cwd;
 
 
         var blank;
@@ -756,29 +755,34 @@
                                       if(i!=-1){
                                             i1    = i;
                                       }
-                                      i   = line.indexOf('~/');
+                                      i   = line.indexOf('~');
                                       if(i!=-1){
                                             i1    = i;
                                       }
                                       if(i1!==undefined){
                                             var i2    = line.indexOf('\x1b[39m');
                                             if(i1<i2){
-                                                  var dir   = line.slice(i1,i2)+'/';
-                                                  if(cwd_initial===undefined){
-                                                        cwd_initial   = dir.replace('~','/home');
-                                                                                console.log('[ cwd_initial ]',cwd_initial);
-                                                        user_dir      = dir.slice(2);
+                                                  var dir   = line.slice(i1,i2);
+                                                  if(dir!='/'){
+                                                        dir  += '/';
+                                                  }
+                                                  if(user_dir===undefined){
+                                                        user_dir      = dir.slice(2,-1);
                                                                                 console.log('[ user_dir ]',user_dir);
                                                   }
-                                                  if(cwd.startsWith('~')){
-                                                        cwd_abs   = dir.replace('~','/home');
+                                                  if(dir.indexOf('~')!=-1){
+                                                        dir   = dir.replace('~',`/home`);
+                                                  }
+                                                  
+                                                  if(dir.startsWith(`/home/${user_dir}`)){
+                                                        cwd_abs   = dir;
+                                                        cwd       = dir.slice(user_dir.length+6);
                                                   }else{
                                                         cwd_abs   = dir;
+                                                        cwd       = null;
                                                   }
-                                                  
-                                                  cwd   = dir.slice(cwd_abs.length-1);
-                                                                                console.log('[     cwd ]',cwd);
                                                                                 console.log('[ cwd_abs ]',cwd_abs);
+                                                                                console.log('[     cwd ]',cwd);
                                             }
                                     }
                                 }