diff options
| author | Aaron Griffin <aaronmgriffin@gmail.com> | 2009-01-14 16:37:23 -0500 |
|---|---|---|
| committer | Aaron Griffin <aaronmgriffin@gmail.com> | 2009-01-14 16:37:23 -0500 |
| commit | 6e0ea2deb4f28baeebef2c549c30daee60f8e8d7 (patch) | |
| tree | 9435980a4ad6367b8118eaedac330b306d788741 /db-functions | |
| parent | 3fb6203f79434d48954f6ef3c5be7067beaccd86 (diff) | |
| parent | 5f64e9993a494040b0280ed0f1daa38f68f9c46b (diff) | |
Merge branch 'master' of file:///srv/projects/git/dbscripts
Conflicts:
db-update
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
Diffstat (limited to 'db-functions')
| -rw-r--r-- | db-functions | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/db-functions b/db-functions index b196d57..a2e2f72 100644 --- a/db-functions +++ b/db-functions @@ -3,7 +3,10 @@ # Random integrity things [ "$UID" = "" ] && UID=$(uid) -BASEDIR="$(dirname $0)" +if [ -z "$BASEDIR" ]; then + BASEDIR="$(dirname $0)" +fi + if [ -f "$BASEDIR/config" ]; then . "$BASEDIR/config" fi |