Refactor pj function

- Use `emulate -L zsh` to make all variables local. - Use `shwordsplit` to interpret `$cmd` spaces correctly. - Rename `$project` and `$file` variables to the more appropriate `$basedir` and `$project`.

Refactor pj function
7f8851f5 · Marc Cornellà · c9c11d60 · 7f8851f5
Commit 7f8851f5 authored Aug 10, 2016 by Marc Cornellà
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 12 deletions

pj.plugin.zsh plugins/pj/pj.plugin.zsh +14 -12

No files found.
--- a/plugins/pj/pj.plugin.zsh
+++ b/plugins/pj/pj.plugin.zsh
 alias pjo="pj open"
-function pj () {
+pj () {
+    emulate -L zsh
+    setopt shwordsplit
    cmd="cd"
-    file=$1
+    project=$1
-    if [[ "open" == "$file" ]] then
+    if [[ "open" == "$project" ]]; then
        shift
-        file=$*
+        project=$*
-        cmd=(${(s: :)EDITOR})
+        cmd=$EDITOR
    else
-        file=$*
+        project=$*
    fi
-    for project in $PROJECT_PATHS; do
+    for basedir ($PROJECT_PATHS); do
-        if [[ -d $project/$file ]] then
+        if [[ -d "$basedir/$project" ]]; then
-            $cmd "$project/$file"
+            $cmd "$basedir/$project"
-            unset project # Unset project var
            return
        fi
    done
-    echo "No such project $1"
+    echo "No such project '${project}'."
 }
-function _pj () {
+_pj () {
    emulate -L zsh
    typeset -a projects