# HG changeset patch # User Edho Prima Arief # Date 1319616939 -25200 # Node ID 173833e4ba35f4280b7969256ff5331658d31daa # Parent eacc854eae6786af6cfdec5a56f77ecd7d4a3df1# Parent 6a7305364793a95b856f3a63091c0b07ae95e953 Merge. diff -r 6a7305364793 -r 173833e4ba35 bash --- a/bash Fri Oct 21 14:56:47 2011 +0700 +++ b/bash Wed Oct 26 15:15:39 2011 +0700 @@ -1,8 +1,10 @@ #!/usr/bin/env bash if [ "${ECOS_BASH_LOADED}" != "yes" ]; then - -export ECOS_BASH_LOADED="yes" + ECOS_BASH_LOADED="yes" +else + return +fi [ -f "${HOME}/.ecos_bash.before" ] && . "${HOME}/.ecos_bash.before" @@ -88,5 +90,3 @@ fi [ -f "${HOME}/.ecos_bash.after" ] && . "${HOME}/.ecos_bash.after" -fi -