projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add override configuration file option to builder.sh
[brisk.git]
/
sql
/
builder.sh
diff --git
a/sql/builder.sh
b/sql/builder.sh
index
b71624d
..
16dafab
100755
(executable)
--- a/
sql/builder.sh
+++ b/
sql/builder.sh
@@
-8,7
+8,7
@@
DATECUR="$(date +%s)"
# functions
usage () {
echo " USAGE"
# functions
usage () {
echo " USAGE"
- echo " $0 <command> [-d|--dryrun] [<-a|--allfiles>|<-p|--devfiles>] [-s|--short] ..."
+ echo " $0 <command> [-
c|--config <override_file>] [-
d|--dryrun] [<-a|--allfiles>|<-p|--devfiles>] [-s|--short] ..."
echo " $0 <-h|--help|help>"
echo " commands are:"
echo " create"
echo " $0 <-h|--help|help>"
echo " commands are:"
echo " create"
@@
-55,12
+55,12
@@
one_or_all() {
if [ "$1" ]; then
echo "$1"
elif [ "$TYPE_FILES" = "a" ]; then
if [ "$1" ]; then
echo "$1"
elif [ "$TYPE_FILES" = "a" ]; then
- echo sql.d/[0-9]*
+ find sql.d/ -name '[0-9]*' -type f | sort -n | tr '\n' ' '
elif [ "$TYPE_FILES" = "d" ]; then
elif [ "$TYPE_FILES" = "d" ]; then
- echo sql.d/[0-9]*.{sql,devel}
+ find sql.d/ -name '[0-9]*' | egrep '.*_devel.sql$|^[^_]+.sql$' | sort -n | tr '\n' ' '
else
else
- echo sql.d/[0-9]*.sql
-
fi); do
+ find sql.d/ -name '[0-9]*' | egrep '^[^_]+.sql$' | sort -n | tr '\n' ' '
+ fi); do
echo "-- FILE BEG: $fil"
cat "$fil"
echo "-- FILE END: $fil"
echo "-- FILE BEG: $fil"
cat "$fil"
echo "-- FILE END: $fil"
@@
-77,6
+77,10
@@
shift
while [ $# -gt 0 ]; do
case $1 in
while [ $# -gt 0 ]; do
case $1 in
+ -c|--config)
+ CONFIG_FILE=$2
+ shift
+ ;;
-d|--dryrun)
DRY_RUN=y
psql () {
-d|--dryrun)
DRY_RUN=y
psql () {
@@
-117,6
+121,10
@@
if [ -f $HOME/.brisk_install ]; then
source $HOME/.brisk_install
fi
source $HOME/.brisk_install
fi
+if [ -f "$CONFIG_FILE" ]; then
+ source "$CONFIG_FILE"
+fi
+
pg_args=""
test "$DBHOST" != "" && pg_args="$pg_args -h $DBHOST"
test "$DBUSER" != "" && pg_args="$pg_args -U $DBUSER"
pg_args=""
test "$DBHOST" != "" && pg_args="$pg_args -h $DBHOST"
test "$DBUSER" != "" && pg_args="$pg_args -U $DBUSER"