Merge pull request #349 from zplug/fix-348

Fix #348
zplug · Jan 6, 2017 · 41d7983 · 41d7983
2 parents 951e74d + 8deef6e
commit 41d7983
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/base/job/process.zsh b/base/job/process.zsh
@@ -22,9 +22,9 @@ __zplug::job::process::get_status_code() {
     fi
 
     cat "$_zplug_log[$target]" \
-        | grep "^repo:$repo\t" \
-        | awk '{print $2}' \
-        | cut -d: -f2
+        | __zplug::utils::awk::ltsv \
+        'key("repo")=="'"$repo"'"{print key("status")}'
+
     return $status
 }
 

diff --git a/base/utils/awk.zsh b/base/utils/awk.zsh
@@ -64,3 +64,24 @@ __zplug::utils::awk::available()
         return 1
     fi
 }
+
+__zplug::utils::awk::ltsv()
+{
+    local \
+        user_awk_script="$1" \
+        ltsv_awk_script
+
+    ltsv_awk_script=$(cat <<-'EOS'
+    function key(name) {
+        for (i = 1; i <= NF; i++) {
+            match($i, ":");
+            xs[substr($i, 0, RSTART)] = substr($i, RSTART+1);
+        };
+        return xs[name":"];
+    }
+EOS
+    )
+
+    awk -F'\t' \
+        "${ltsv_awk_script} ${user_awk_script}"
+}