added menu and error messages to projects plugin. indentation cleanup to conform to editorconfig.

completion/available/projects.completion.bash

@@ -1,38 +1,39 @@
 _pj() {
-    [ -z "$PROJECT_PATHS" ] && return
+  [ -z "$PROJECT_PATHS" ] && return
-    shift
+  shift
-    [ "$1" == "open" ] && shift
+  [ "$1" == "open" ] && shift
 
-    local cur prev words cword
+  local cur prev words cword
-    _init_completion || return
+  _init_completion || return
 
-    local IFS=$'\n' i j k
+  local IFS=$'\n' i j k
 
-    compopt -o filenames
+  compopt -o filenames
 
-    local -r mark_dirs=$(_rl_enabled mark-directories && echo y)
+  local -r mark_dirs=$(_rl_enabled mark-directories && echo y)
-    local -r mark_symdirs=$(_rl_enabled mark-symlinked-directories && echo y)
+  local -r mark_symdirs=$(_rl_enabled mark-symlinked-directories && echo y)
 
-    for i in ${PROJECT_PATHS//:/$'\n'}; do
+  for i in ${PROJECT_PATHS//:/$'\n'}; do
-        # create an array of matched subdirs
+    # create an array of matched subdirs
-        k="${#COMPREPLY[@]}"
+    k="${#COMPREPLY[@]}"
-        for j in $( compgen -d $i/$cur ); do
+    for j in $( compgen -d $i/$cur ); do
-            if [[ ( $mark_symdirs && -h $j || $mark_dirs && ! -h $j ) && ! -d ${j#$i/} ]]; then
+      if [[ ( $mark_symdirs && -h $j || $mark_dirs && ! -h $j ) && ! -d ${j#$i/} ]]; then
-                j+="/"
+        j+="/"
-            fi
+      fi
-            COMPREPLY[k++]=${j#$i/}
+      COMPREPLY[k++]=${j#$i/}
-        done
     done
+  done
 
-    if [[ ${#COMPREPLY[@]} -eq 1 ]]; then
+  if [[ ${#COMPREPLY[@]} -eq 1 ]]; then
-        i=${COMPREPLY[0]}
+    i=${COMPREPLY[0]}
-        if [[ "$i" == "$cur" && $i != "*/" ]]; then
+    if [[ "$i" == "$cur" && $i != "*/" ]]; then
-            COMPREPLY[0]="${i}/"
+      COMPREPLY[0]="${i}/"
-        fi
     fi
+  fi
 
-    return 0
+  return 0
 }
 
 complete -F _pj -o nospace pj
+complete -F _pj -o nospace pjo
 

plugins/available/projects.plugin.bash

@@ -2,30 +2,74 @@ cite about-plugin
 about-plugin 'add "export PROJECT_PATHS=~/projects:~/intertrode/projects" to navigate quickly to your project directories with `pj` and `pjo`'
 
 function pj {
-    about 'navigate quickly to your various project directories'
+about 'navigate quickly to your various project directories'
-    group 'projects'
+group 'projects'
 
-    if [ -n "$PROJECT_PATHS" ]; then
-        local cmd
 
-        if [ "$1" == "open" ]; then
+if [ -z "$PROJECT_PATHS" ]; then
-            shift
+  echo "error: PROJECT_PATHS not set"
-            cmd="$EDITOR"
+  return 1
-        fi
+fi
 
-        cmd="${cmd:-cd}"
 
-        if [ -n "$1" ]; then
+local cmd
-            for i in ${PROJECT_PATHS//:/$'\n'}; do
+local dest
-                if [ -d "$i"/"$1" ]; then
+local -a dests
-                    $cmd "$i"/"$1"
-                    return
-                fi
-            done
-        fi
-    fi
 
-    echo "No such project '$1'"
+
+if [ "$1" == "open" ]; then
+  shift
+  cmd="$EDITOR"
+fi
+cmd="${cmd:-cd}"
+
+
+if [ -z "$1" ]; then
+  echo "error: no project provided"
+  return 1
+fi
+
+
+# collect possible destinations to account for directories
+# with the same name in project directories
+for i in ${PROJECT_PATHS//:/$'\n'}; do
+  if [ -d "$i"/"$1" ]; then
+    dests+=("$i/$1")
+  fi
+done
+
+
+# when multiple destinations are found, present a menu
+if [ ${#dests[@]} -eq 0 ]; then
+  echo "error: no such project '$1'"
+  return 1
+
+elif [ ${#dests[@]} -eq 1 ]; then
+  dest="${dests[0]}"
+
+elif [ ${#dests[@]} -gt 1 ]; then
+  PS3="Multiple project directories found. Please select one: "
+  dests+=("cancel")
+  select d in "${dests[@]}"; do
+    case $d in
+      "cancel")
+        return
+        ;;
+      *)
+        dest=$d
+        break
+        ;;
+    esac
+  done
+
+else
+  echo "error: please report this error"
+  return 1 # should never reach this
+
+fi
+
+
+$cmd "$dest"
 }
 
 alias pjo="pj open"