Using LAMPADAS_DB_USER from setenv.sh (instead of local DB_USER)

Directory LAMPADAS_SPOOL is created if it does not exist.
This commit is contained in:
alba 2002-10-27 21:00:50 +00:00
parent 602a162064
commit 632b4e59df
1 changed files with 5 additions and 4 deletions

View File

@ -1,7 +1,6 @@
#!/bin/sh #!/bin/sh
SCRIPT_NAME=lampadasdb SCRIPT_NAME=lampadasdb
DB_USER=lampadas
usage() usage()
{ {
@ -206,7 +205,7 @@ m4script()
psqlcmd() psqlcmd()
{ {
# the record separator is a tabstop + a newline + a tabstop # the record separator is a tabstop + a newline + a tabstop
psql -U $DB_USER -q -A -F '], [' -P tuples_only -R " psql -U $LAMPADAS_DB_USER -q -A -F '], [' -P tuples_only -R "
" -v I18N_lang_code=\'$1\' $LAMPADAS_DB \ " -v I18N_lang_code=\'$1\' $LAMPADAS_DB \
< "$2" \ < "$2" \
| "$LAMPADAS_SQL/common.export" | "$LAMPADAS_SQL/common.export"
@ -252,7 +251,7 @@ ExportM4()
ExportOne "$sqlcmd" EN > "$dst_dir/EN.m4" ExportOne "$sqlcmd" EN > "$dst_dir/EN.m4"
else else
# we know the field name, now select all available languages # we know the field name, now select all available languages
psql -U $DB_USER -q -A -P tuples_only \ psql -U $LAMPADAS_DB_USER -q -A -P tuples_only \
-c "SELECT DISTINCT $field FROM $table;" \ -c "SELECT DISTINCT $field FROM $table;" \
$LAMPADAS_DB \ $LAMPADAS_DB \
| while read lang | while read lang
@ -304,6 +303,8 @@ check_var "$LAMPADAS_SPOOL" "LAMPADAS_SPOOL" "spool"
check_var "$LAMPADAS_SQL" "LAMPADAS_SQL" "sql" check_var "$LAMPADAS_SQL" "LAMPADAS_SQL" "sql"
check_var "$LAMPADAS_WWW_USER" "LAMPADAS_WWW_USER" check_var "$LAMPADAS_WWW_USER" "LAMPADAS_WWW_USER"
[ -d $LAMPADAS_SPOOL ] || mkdir $LAMPADAS_SPOOL
TABLE_ORDER="$LAMPADAS_SPOOL/table_order.mak" TABLE_ORDER="$LAMPADAS_SPOOL/table_order.mak"
need_rebuild "$TABLE_ORDER" && build_makefile need_rebuild "$TABLE_ORDER" && build_makefile
@ -320,4 +321,4 @@ if need_rebuild "$sql"; then
) > $sql || exit -1 ) > $sql || exit -1
fi fi
echo "Executing $sql" \ echo "Executing $sql" \
&& psql -U $DB_USER $LAMPADAS_DB -qf "$sql" && psql -U $LAMPADAS_DB_USER $LAMPADAS_DB -qf "$sql"