touchup of embarrassingly old crap

activate_proj

@@ -1,64 +1,68 @@
 #!/bin/bash
+# This file is meant to be *sourced*, not executed.
 
-USAGE="Usage: $HOME/.activate_proj <proj>"
+USAGE="Usage: source $HOME/.activate_proj <proj>"
 
 function __run_activate(){
-  if [ -n "${1}" ] ; then
+    if [[ ! -n "${1}" ]] ; then
-      PROJ=${1}
+        echo $USAGE
-      local PROJDIR="${HOME}/src/${PROJ}"
+        return 1
-      if [[ -d "$PROJDIR" ]] ; then
+    fi
-          export PROJ
-          export PROJSRC="$PROJDIR/src"
-          export PROJBIN="${PROJDIR}/bin"
-          cd "${PROJSRC}"
 
-          _HAS_GIT=""
+    PROJ=${1}
-          if [[ -d "$PWD/.git" ]]
+    local PROJDIR="${HOME}/src/${PROJ}"
-          then
-              _HAS_GIT="yup"
-          fi
 
-          _HG_BRANCH=""
+    if [[ ! -d "$PROJDIR" ]] ; then
-          _HAS_HG=""
+        echo "Hey! '${1}' is not a valid project."
-          if [[ -d "$PWD/.hg" ]]
+        echo "Pick from these:"
-          then
+        echo
-              _HG_BRANCH="$PWD/.hg/branch"
+        for p in $( ls -1 -I "*.egg" "${HOME}/src" ) ; do
-              _HAS_HG="yup"
+            echo "    $p"
-          fi
+        done
+        return 2
+    fi
 
-          echo "Changed to ${PROJSRC}"
+    export PROJ
-          if [[ -e "${PROJBIN}/activate" ]]
+    export PROJSRC="$PROJDIR/src"
-          then
+    export PROJBIN="${PROJDIR}/bin"
-            source "${PROJBIN}/activate"
+    cd "${PROJSRC}"
-          fi
-          echo "${PROJ} activated"
 
-          PROMPT_COMMAND='precmd; PS1="(\[\033[33m\]\${PROJ}\[\033[00m\]) _VCS_BRANCH_$PS1"'
+    _HAS_GIT=""
-          export PROMPT_COMMAND
+    if [[ -d "$PWD/.git" ]]
+    then
+        _HAS_GIT="yup"
+    fi
 
-          if [[ -n "$_HAS_HG" ]]
+    _HG_BRANCH=""
-          then
+    _HAS_HG=""
-              if [[ -n "$(/bin/ls $(hg root)/.hg/branches 2>/dev/null)" ]]
+    if [[ -d "$PWD/.hg" ]]
-              then
+    then
-                  PROMPT_COMMAND=$(echo $PROMPT_COMMAND | sed "s@_VCS_BRANCH_@(lb:\`hg lbranch 2>/dev/null\`) @")
+        _HG_BRANCH="$PWD/.hg/branch"
-              else
+        _HAS_HG="yup"
-                  PROMPT_COMMAND=$(echo $PROMPT_COMMAND | sed "s@_VCS_BRANCH_@(b:\`cat ${PROJSRC}/.hg/branch 2>/dev/null\`) @")
+    fi
-              fi
+
-          else
+    echo "Changed to ${PROJSRC}"
-              PROMPT_COMMAND=$(echo $PROMPT_COMMAND | sed "s/_VCS_BRANCH_//" )
+    if [[ -e "${PROJBIN}/activate" ]]
-          fi
+    then
-          export PS2=""
+      source "${PROJBIN}/activate"
-      else
+    fi
-          echo "Hey! '${1}' is not a valid project."
+    echo "${PROJ} activated"
-          echo "Pick from these:"
+
-          echo
+    PROMPT_COMMAND='precmd; PS1="(\[\033[33m\]\${PROJ}\[\033[00m\]) _VCS_BRANCH_$PS1"'
-          for p in $( ls -1 -I "*.egg" "${HOME}/src" ) ; do
+    export PROMPT_COMMAND
-              echo "    $p"
+
-          done
+    if [[ -n "$_HAS_HG" ]]
-      fi
+    then
-  else
+        if [[ -n "$(/bin/ls $(hg root)/.hg/branches 2>/dev/null)" ]]
-      echo ${USAGE}
+        then
-  fi
+            PROMPT_COMMAND=$(echo $PROMPT_COMMAND | sed "s@_VCS_BRANCH_@(lb:\`hg lbranch 2>/dev/null\`) @")
+        else
+            PROMPT_COMMAND=$(echo $PROMPT_COMMAND | sed "s@_VCS_BRANCH_@(b:\`cat ${PROJSRC}/.hg/branch 2>/dev/null\`) @")
+        fi
+    else
+        PROMPT_COMMAND=$(echo $PROMPT_COMMAND | sed "s/_VCS_BRANCH_//" )
+    fi
+    export PS2=""
 }
 
 __run_activate "$@"