From fe8fbd8bcb504d23f48edc3b0814ebee1018fea3 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Wed, 18 Aug 2010 14:32:09 +0000
Subject: [PATCH] admin scripts for screening
SVN: 17513
---
screening/dist/admin/env | 2 ++
screening/dist/admin/reset-display-settings.sh | 2 +-
screening/dist/admin/upgrade.sh | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/screening/dist/admin/env b/screening/dist/admin/env
index 74042676935..9c54a0d1835 100644
--- a/screening/dist/admin/env
+++ b/screening/dist/admin/env
@@ -1,6 +1,8 @@
OPENBIS_DB=openbis_screening_mydb
IMAGING_DB=imaging_mydb
+DB_USER_NAME=postgres
+
# Unalias rm and cp commands
alias cp='cp'
alias rm='rm'
diff --git a/screening/dist/admin/reset-display-settings.sh b/screening/dist/admin/reset-display-settings.sh
index b5aaeeb796d..80db7a9dd44 100755
--- a/screening/dist/admin/reset-display-settings.sh
+++ b/screening/dist/admin/reset-display-settings.sh
@@ -13,4 +13,4 @@ fi
source $BASE/env
-psql -U postgres -d $OPENBIS_DB -c "update persons set display_settings = (select display_settings from persons where user_id = '$TEMPLATE_USER') where user_id != '$TEMPLATE_USER'"
+psql -U $DB_USER_NAME -d $OPENBIS_DB -c "update persons set display_settings = (select display_settings from persons where user_id = '$TEMPLATE_USER') where user_id != '$TEMPLATE_USER'"
diff --git a/screening/dist/admin/upgrade.sh b/screening/dist/admin/upgrade.sh
index ab9f64e2abf..684aa9f7b66 100755
--- a/screening/dist/admin/upgrade.sh
+++ b/screening/dist/admin/upgrade.sh
@@ -25,8 +25,8 @@ mv $ROOT_DIR/openBIS-server $OLD_BIS
mv $ROOT_DIR/datastore_server $BACKUP_DIR/datastore_server-$NOW
# pg_restore -d db-name db-file.dmp
-pg_dump -U openbis -Fc $OPENBIS_DB > $BACKUP_DIR/$OPENBIS_DB-${NOW}.dmp
-pg_dump -U openbis -Fc $IMAGING_DB > $BACKUP_DIR/$IMAGING_DB-${NOW}.dmp
+pg_dump -U $DB_USER_NAME -Fc $OPENBIS_DB > $BACKUP_DIR/$OPENBIS_DB-${NOW}.dmp
+pg_dump -U $DB_USER_NAME -Fc $IMAGING_DB > $BACKUP_DIR/$IMAGING_DB-${NOW}.dmp
echo Installing openBIS Datastore Server
unzip $ROOT_DIR/datastore*.zip
--
GitLab