projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved chunked_content into user class and set chunked as optional
[brisk.git]
/
sql
/
builder.sh
diff --git
a/sql/builder.sh
b/sql/builder.sh
index
387af9a
..
2a02633
100755
(executable)
--- a/
sql/builder.sh
+++ b/
sql/builder.sh
@@
-3,8
+3,9
@@
#
# all this part is from mopshop and we will use it to construct the brisk database
#
#
# all this part is from mopshop and we will use it to construct the brisk database
#
-
-if [ -f $HOME/.db.conf ]; then
+if [ -f $HOME/.brisk-db.conf ]; then
+ source $HOME/.brisk-db.conf
+elif [ -f $HOME/.db.conf ]; then
source $HOME/.db.conf
else
DBHOST=127.0.0.1
source $HOME/.db.conf
else
DBHOST=127.0.0.1
@@
-89,7
+90,7
@@
elif [ "$1" = "dumpall" ]; then
pg_dump -h $DBHOST -U $DBUSER $DBBASE > $2
fi
elif [ "$1" = "add" ]; then
pg_dump -h $DBHOST -U $DBUSER $DBBASE > $2
fi
elif [ "$1" = "add" ]; then
- cat "$2" |
psql $pg_args
+ cat "$2" |
sqlexe $sht
else
echo " USAGE"
echo " ./builder create"
else
echo " USAGE"
echo " ./builder create"