diff --git a/build.gradle b/build.gradle index b10c9c55..0d7e6a38 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'com.glencoesoftware.omero' -version = '0.10.0' +version = '0.10.1-SNAPSHOT' mainClassName = 'com.glencoesoftware.omero.ms.image.region.OmeroVertxLauncher' diff --git a/src/dist/regen-memo-files.sh b/src/dist/regen-memo-files.sh index b7029a1f..5d561628 100755 --- a/src/dist/regen-memo-files.sh +++ b/src/dist/regen-memo-files.sh @@ -164,8 +164,10 @@ else DB_HOST=$( grep omero.db.host ${MS_CONFIG} |awk -F: '{ print $2 }' | sed -re 's/\s+//g' -e 's/\"//g') DB_NAME=$( grep omero.db.name ${MS_CONFIG} |awk -F: '{ print $2 }' | sed -re 's/\s+//g' -e 's/\"//g') DB_PASS=$( grep omero.db.pass ${MS_CONFIG} |awk -F: '{ print $2 }' | sed -re 's/\s+//g' -e 's/\"//g') + PSQL_OPTIONS="postgresql://${DB_USER:-omero}:${DB_PASS:-omero}@${DB_HOST:-localhost}:${DB_PORT:-5432}/${DB_NAME:-omero}" + else + PSQL_OPTIONS=${DB} fi - PSQL_OPTIONS="postgresql://${DB_USER:-omero}:${DB_PASS:-omero}@${DB_HOST:-localhost}:${DB_PORT:-5432}/${DB_NAME:-omero}" psql ${PSQL_OPTIONS} omero -f ${MEMOIZER_HOME}/memo_regenerator.sql > ${FULL_CSV} fi [ -n "${DRYRUN}" ] && set -x