Merge pull request #275 from andjscott/prompt_dir_shortening

Handle shorting path when in the .git directory

powerlevel9k.zsh-theme

@@ -467,26 +467,18 @@ prompt_dir() {
         local name repo_path package_path current_dir zero
 
         # Get the path of the Git repo, which should have the package.json file
-        if repo_path=$(git rev-parse --git-dir 2>/dev/null); then
-          if [[ "$repo_path" == ".git" ]]; then
-            # If the current path is the root of the project, then the package path is
-            # the current directory and we don't want to append anything to represent
-            # the path to a subdirectory
-            package_path="."
-            subdirectory_path=""
-          else
-            # If the current path is something else, get the path to the package.json
-            # file by finding the repo path and removing the '.git` from the path
-            package_path=${repo_path:0:-4}
+        if [[ $(git rev-parse --is-inside-work-tree 2> /dev/null) == "true" ]]; then
+          package_path=$(git rev-parse --show-toplevel)
+        elif [[ $(git rev-parse --is-inside-git-dir 2> /dev/null) == "true" ]]; then
+          package_path=${$(pwd)%%/.git*}
+        fi
+
         zero='%([BSUbfksu]|([FB]|){*})'
         current_dir=$(pwd)
         # Then, find the length of the package_path string, and save the
         # subdirectory path as a substring of the current directory's path from 0
         # to the length of the package path's string
-            subdirectory_path=$(truncatePathFromRight "/${current_dir:${#${(S%%)package_path//$~zero/}}}")
-          fi
-        fi
-
+        subdirectory_path=$(truncatePathFromRight "${current_dir:${#${(S%%)package_path//$~zero/}}}")
         # Parse the 'name' from the package.json; if there are any problems, just
         # print the file path
         if name=$( cat "$package_path/package.json" 2> /dev/null | grep -m 1 "\"name\""); then