Procházet zdrojové kódy

Adding PS1 with colors and stuff. Fixing p4backout for sync-to-head

Sam Jaffe před 8 roky
rodič
revize
ae4961f7f2
2 změnil soubory, kde provedl 19 přidání a 2 odebrání
  1. 6 2
      profile-p4
  2. 13 0
      profile-util

+ 6 - 2
profile-p4

@@ -38,13 +38,17 @@ p4backout() {
   fi
   local changenum="$1"
   local target_stage="@${2}"
-  if [[ ${target_stage} == "@HEAD" ]]; then target_stage=""; fi
   local lastchange=$((changenum-1))
+
   p4 sync @$lastchange
   p4 edit ...
   p4 sync @$changenum
   p4 resolve -ay
-  p4 sync $target_stage
+  if [[ ${target_stage} == "@HEAD"  ]]; then
+    p4 sync
+  else
+    p4 sync $target_stage
+  fi
   p4 resolve -am
 }
 

+ 13 - 0
profile-util

@@ -1,3 +1,16 @@
+CYAN="\e[96m"
+GREEN="\e[92m"
+RED="\e[91m"
+RESET="\e[0m"
+SUCCESS() {
+  if [[ $1 -eq 0 ]] || [[ $1 -gt 128 ]]; then
+    echo -en $GREEN 
+  else
+    echo -en $RED
+  fi
+}
+CODE() { [[ $1 -eq 0  ]] || [[ $1 -gt 128  ]] || echo "(rc=$1) "; }
+export PS1='$(rc=$?; echo -e "\[$CYAN\]\D{%F %T} \[$(SUCCESS $rc)\]\u@\h:[\w] $(CODE $rc)\[$RESET\]$ ")'
 
 PATH="$HOME/usr/local/bin:$HOME/bin:$HOME/usr/bin:$PATH"
 export PATH