X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=sql%2Fbuilder.sh;h=2c4bbfa4354d3cb7f045712255620a22e5e6c996;hb=5bd74dd5c8d06057ea34c4ebde51551e1e580ea0;hp=387af9a8ecd851380e4921c78be98f5210ad4175;hpb=1d6aed32137b7909bfa0d19b85ad0c0fb04fd776;p=brisk.git diff --git a/sql/builder.sh b/sql/builder.sh index 387af9a..2c4bbfa 100755 --- 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 # - -if [ -f $HOME/.db.conf ]; then +if [ -f $HOME/.brisk-spu-db.conf ]; then + source $HOME/.brisk-spu-db.conf +elif [ -f $HOME/.db.conf ]; then source $HOME/.db.conf else DBHOST=127.0.0.1 @@ -15,8 +16,8 @@ else PFX="bsk_" fi -if [ -f $HOME/.brisk_install ]; then - source $HOME/.brisk_install +if [ -f $HOME/.brisk_spu_install ]; then + source $HOME/.brisk_spu_install fi pg_args="" @@ -89,7 +90,7 @@ elif [ "$1" = "dumpall" ]; 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"