diff --git a/sbin/destroy_all_dm_databases.sh b/sbin/destroy_all_dm_databases.sh index 16c5d15be5f633de45a15c132bdd5b2f3a42ff5d..52a56cbfdfbf9194fe1e693ca63882075c6e75bb 100755 --- a/sbin/destroy_all_dm_databases.sh +++ b/sbin/destroy_all_dm_databases.sh @@ -16,7 +16,6 @@ DM_DB_PORT=11136 DM_DB_ADMIN_USER=postgres DM_DB_ADMIN_HOSTS="127.0.0.1 bluegill1.aps.anl.gov visa%.aps.anl.gov" DM_DB_ADMIN_PASSWORD= -DM_DB_CHARACTER_SET=utf8 CURRENT_DIR=`pwd` @@ -26,8 +25,7 @@ cd $CURRENT_DIR if [ -z "${DM_ROOT_DIR}" ]; then DM_ROOT_DIR=$MY_DIR/.. fi -DM_SQL_DIR=$DM_ROOT_DIR/db -DM_RUN_DIR=$DM_ROOT_DIR/var/run +DM_RUN_DIR=${DM_INSTALL_DIR}/var/run DM_ENV_FILE=${DM_ROOT_DIR}/setup.sh if [ ! -f ${DM_ENV_FILE} ]; then echo "Environment file ${DM_ENV_FILE} does not exist."