Merge branch 'next' into truncate_composer_json

2017-03-08 15:01:53 -05:00 · 2017-03-08 15:01:53 -05:00 · 622c04eee3
commit 622c04eee3
parent ecd180a285 136a5217e3
14 changed files with 233 additions and 16 deletions
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@ -664,7 +664,7 @@ prompt_dir() {
            break;
          fi
        done
-
+        
        local packageName=$(jq '.name' ${pkgFile} 2> /dev/null \
          || node -e 'console.log(require(process.argv[1]).name);' ${pkgFile} 2>/dev/null \
          || cat "${pkgFile}" 2> /dev/null | grep -m 1 "\"name\"" | awk -F ':' '{print $2}' | awk -F '"' '{print $2}' 2>/dev/null \