Mercurial > dive4elements > river
changeset 5191:4aa748db8be3
Use less ambigious names for variables
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Thu, 07 Mar 2013 16:02:33 +0100 |
| parents | 7b37876b2f51 |
| children | 1b6d4edeeb4c |
| files | flys-backend/contrib/import_river.sh |
| diffstat | 1 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-backend/contrib/import_river.sh Thu Mar 07 15:22:01 2013 +0100 +++ b/flys-backend/contrib/import_river.sh Thu Mar 07 16:02:33 2013 +0100 @@ -128,16 +128,16 @@ esac done -if [ -z $USER ]; then +if [ -z $DBUSER ]; then USER=$DEFAULT_USER fi -if [ -z $PASS ]; then +if [ -z $DBPASS ]; then PASS=$DEFAULT_PASS fi -if [ -z $PORT ]; then +if [ -z $DBPORT ]; then PORT=$DEFAULT_PORT fi -if [ -z $HOST ]; then +if [ -z $DBHOST ]; then HOST=$DEFAULT_HOST fi if [ -z $BACKEND_NAME ]; then @@ -167,8 +167,8 @@ echo "Could not find Postgres importer $JAR" exit 1 fi - OGR_CONNECTION="PG:dbname=$BACKEND_NAME host=$HOST port=$PORT \ - user=$USER password=$PASS" + OGR_CONNECTION="PG:dbname=$BACKEND_NAME host=$DBHOST port=$DBPORT \ + user=$DBUSER password=$DBPASS" BACKEND_DB_PREFIX="jdbc:postgresql:" BACKEND_DB_DRIVER="org.postgresql.Driver" BACKEND_DB_DIALECT="org.hibernate.dialect.PostgreSQLDialect" @@ -178,7 +178,7 @@ BACKEND_DB_DIALECT="org.hibernate.dialect.OracleDialect" fi -BACKEND_URL=$BACKEND_DB_PREFIX//$HOST:$PORT/$BACKEND_NAME +BACKEND_URL=$BACKEND_DB_PREFIX//$DBHOST:$DBPORT/$BACKEND_NAME echo "Importing $RIVER_NAME into $BACKEND_URL." @@ -191,8 +191,8 @@ -Xmx$MIN_MEMORY \ -server \ -Dlog4j.configuration=file://$LOG_DIR/log4j.properties \ - -Dflys.backend.user=$USER \ - -Dflys.backend.password=$PASS \ + -Dflys.backend.user=$DBUSER \ + -Dflys.backend.password=$DBPASS \ -Dflys.backend.url=$BACKEND_URL \ -Dflys.backend.driver=$BACKEND_DB_DRIVER \ -Dflys.backend.dialect=$BACKEND_DB_DIALECT \ @@ -236,8 +236,8 @@ -Xmx$MIN_MEMORY \ -server \ -Dlog4j.configuration=file://$LOG_DIR/log4j.properties \ - -Dflys.backend.user=$USER \ - -Dflys.backend.password=$PASS \ + -Dflys.backend.user=$DBUSER \ + -Dflys.backend.password=$DBPASS \ -Dflys.backend.url=$BACKEND_URL \ -Dflys.backend.driver=$BACKEND_DB_DRIVER \ -Dflys.backend.dialect=$BACKEND_DB_DIALECT \ @@ -281,8 +281,8 @@ -Xmx$MIN_MEMORY \ -server \ -Dlog4j.configuration=file://$LOG_DIR/log4j.properties \ - -Dflys.backend.user=$USER \ - -Dflys.backend.password=$PASS \ + -Dflys.backend.user=$DBUSER \ + -Dflys.backend.password=$DBPASS \ -Dflys.backend.url=$BACKEND_URL \ -Dflys.backend.driver=$BACKEND_DB_DRIVER \ -Dflys.backend.dialect=$BACKEND_DB_DIALECT \ @@ -330,9 +330,9 @@ --directory $RIVER_PATH \ --river_name $RIVER_NAME \ --ogr_connection "$OGR_CONNECTION" \ - --host $HOST \ - --user $USER \ - --password $PASS \ + --host $DBHOST \ + --user $DBUSER \ + --password $DBPASS \ --verbose 1 \ > "$LOG_FILE" 2>&1 }