# HG changeset patch
# User Edho Arief <edho@myconan.net>
# Date 1343281034 -25200
# Node ID 3e6324183eb415503df63d554a1dc1ddb0eb20f0
# Parent  f2a5dd14fdfff17695c4519c142748b9085253ef
PATH adjustment.

diff -r f2a5dd14fdff -r 3e6324183eb4 rc/bashrc
--- a/rc/bashrc	Wed Jul 25 04:36:02 2012 +0700
+++ b/rc/bashrc	Thu Jul 26 12:37:14 2012 +0700
@@ -13,8 +13,20 @@
 
 [ -f "${HOME}/.ecos_bash.before" ] && . "${HOME}/.ecos_bash.before"
 
+_org_path="${PATH}"
+export PATH="${HOME}/.ecos_bin:${HOME}/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+
+# pkgsrc
+if test -d /usr/pkg; then
+  PATH="${PATH}:/usr/pkg/bin:/usr/pkg/sbin"
+  if test -d /usr/pkg/java/openjdk7; then
+    # OpenJDK 7 in pkgsrc
+    PATH="${PATH}:/usr/pkg/java/openjdk7/bin"
+  fi
+fi
+
 # Nuke currently defined functions
-unset -f $(set | grep -E ' ()$' | cut -d ' ' -f 1)
+unset -f $(set | egrep ' ()$' | cut -d ' ' -f 1)
 
 # Nuke bash-completion
 complete -r
@@ -22,11 +34,6 @@
 # Nuke aliases
 unalias -a
 
-_org_path="${PATH}"
-export PATH="${HOME}/.ecos_bin:${HOME}/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
-# OpenJDK in pkgsrc
-PATH="${PATH}:/usr/pkg/java/openjdk7/bin"
-
 shopt -s histappend
 PROMPT_COMMAND="history -a; history -n"
 export HISTFILESIZE=10000
@@ -114,7 +121,6 @@
     fi
   ;;
   NetBSD|DragonFly)
-    PATH="${PATH}:/usr/pkg/bin:/usr/pkg/sbin"
     if command -v gls > /dev/null 2>&1; then
       _has_gnu_ls=y
       _ls="gls"