X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.profile.d%2Fps1.bashrc;h=7bd93b7355ca02ab40501bcab65dc55325b1e8e8;hb=a5faa5cee1dcee79c1d576559f892333e6539d24;hp=02836112e7dc815a409a4e7957fad9ed5fbf39c3;hpb=d2bb143d0545987c58f65a8b18c502f792f3f748;p=profile.git

diff --git a/.profile.d/ps1.bashrc b/.profile.d/ps1.bashrc
index 0283611..7bd93b7 100644
--- a/.profile.d/ps1.bashrc
+++ b/.profile.d/ps1.bashrc
@@ -200,14 +200,28 @@ function __ps1_colon() {
 }
 
 function __ps1_short() {
+  local pwd=${PWD/#$HOME/\~}
   local dirtrim=${PROMPT_DIRTRIM//[^0-9]/}
+
+  if [ "${dirtrim:0:1}" = "0" ]; then
+    echo "$pwd"
+    return $1
+  fi
+
   dirtrim=${dirtrim##0}
   if [ -z "$dirtrim" ]; then
-    echo "$PWD"
-    return $1
+    local prompt="$USER$HOSTNAME$pwd"
+    local width=$(((COLUMNS*2)/3))
+    if [ ${#prompt} -le ${width:-53} ]; then
+      echo "$pwd"
+      return $1
+    else
+      dirtrim=1
+    fi
   fi
-  local dirname=${PWD##*/}
-  local basename=${PWD%/$dirname}
+
+  local dirname=${pwd##*/}
+  local basename=${pwd%/$dirname}
   local reversed=
   local component
   for component in ${basename//\// }; do
@@ -216,14 +230,16 @@ function __ps1_short() {
   local n=1
   local short=
   for component in $reversed; do
+    [ $n = 1 -a "$PWD" = "$pwd" ] || short="/$short"
     if [ $n -ge $dirtrim ]; then
-      short="/${component:0:1}$short"
+      short="${component:0:1}$short"
     else
-      short="/$component$short"
+      short="$component$short"
     fi
     n=$((n+1))
   done
-  echo "$short/$dirname"
+
+  echo "$short$dirname"
   return $1
 }