diff --git a/rpms/awips2.core/Installer.maps-database/component.spec b/rpms/awips2.core/Installer.maps-database/component.spec index c72b0e17bc..da50923057 100644 --- a/rpms/awips2.core/Installer.maps-database/component.spec +++ b/rpms/awips2.core/Installer.maps-database/component.spec @@ -108,13 +108,13 @@ SQL_LOG="/awips2/database/sqlScripts/share/sql/maps/maps.log" # Determine if PostgreSQL is running. I_STARTED_POSTGRESQL="NO" -su ${DB_OWNER} -c \ +su - ${DB_OWNER} -c \ "${PG_CTL} status -D /awips2/data > /dev/null 2>&1" RC="$?" # Start PostgreSQL if it is not running. if [ ! "${RC}" = "0" ]; then - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${POSTMASTER} -D /awips2/data > /dev/null 2>&1 &" RC="$?" if [ ! "${RC}" = "0" ]; then @@ -125,7 +125,7 @@ if [ ! "${RC}" = "0" ]; then I_STARTED_POSTGRESQL="YES" else # Show The User. - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${PG_CTL} status -D /awips2/data" fi @@ -140,9 +140,9 @@ fi if [ "${MAPS_DB_EXISTS}" = "false" ]; then # Create the maps directory; remove any existing directories. if [ -d /awips2/data/maps ]; then - su ${DB_OWNER} -c "rm -rf /awips2/data/maps" + su - ${DB_OWNER} -c "rm -rf /awips2/data/maps" fi - su ${DB_OWNER} -c "mkdir -p /awips2/data/maps" + su - ${DB_OWNER} -c "mkdir -p /awips2/data/maps" # Update the sql script that creates the maps database / tables. perl -p -i -e "s/%{database_files_home}%/\/awips2\/data/g" \ @@ -150,20 +150,20 @@ if [ "${MAPS_DB_EXISTS}" = "false" ]; then # Run the setup sql for the maps database. SQL_FILE="/awips2/database/sqlScripts/share/sql/maps/createMapsDb.sql" - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${PSQL} -d postgres -U awips -q -p 5432 -f ${SQL_FILE}" >> ${SQL_LOG} 2>&1 RC=$? if [ ! "${RC}" -eq 0 ]; then printFailureMessage fi - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${PSQL} -d maps -U awips -q -p 5432 -c \"CREATE EXTENSION postgis;\"" >> ${SQL_LOG} 2>&1 if [ $? -ne 0 ]; then printFailureMessage fi - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${PSQL} -d maps -U awips -q -p 5432 -c \"CREATE EXTENSION postgis_topology;\"" >> ${SQL_LOG} 2>&1 if [ $? -ne 0 ]; then printFailureMessage @@ -171,7 +171,7 @@ if [ "${MAPS_DB_EXISTS}" = "false" ]; then # Do we still need legacy? SQL_FILE="/awips2/postgresql/share/contrib/postgis-2.0/legacy.sql" - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${PSQL} -d maps -U awips -q -p 5432 -f ${SQL_FILE}" >> ${SQL_LOG} 2>&1 if [ $? -ne 0 ]; then printFailureMessage @@ -179,17 +179,17 @@ if [ "${MAPS_DB_EXISTS}" = "false" ]; then # Import the data into the maps database. DB_ARCHIVE="/awips2/database/sqlScripts/share/sql/maps/maps.db" - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${PG_RESTORE} -d maps -U awips -p 5432 -n mapdata ${DB_ARCHIVE}" >> ${SQL_LOG} 2>&1 - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${PG_RESTORE} -d maps -U awips -p 5432 -n public -t geometry_columns -a ${DB_ARCHIVE}" \ >> ${SQL_LOG} 2>&1 fi # stop PostgreSQL if we started it. if [ "${I_STARTED_POSTGRESQL}" = "YES" ]; then - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${PG_CTL} stop -D /awips2/data" RC="$?" if [ ! "${RC}" = "0" ]; then @@ -235,13 +235,13 @@ SQL_LOG="/awips2/database/sqlScripts/share/sql/maps/maps.log" # start PostgreSQL if it is not running I_STARTED_POSTGRESQL="NO" -su ${DB_OWNER} -c \ +su - ${DB_OWNER} -c \ "${PG_CTL} status -D /awips2/data > /dev/null 2>&1" RC="$?" # Start PostgreSQL if it is not running. if [ ! "${RC}" = "0" ]; then - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${POSTMASTER} -D /awips2/data > /dev/null 2>&1 &" RC="$?" if [ ! "${RC}" = "0" ]; then @@ -253,7 +253,7 @@ if [ ! "${RC}" = "0" ]; then I_STARTED_POSTGRESQL="YES" else # Show The User. - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${PG_CTL} status -D /awips2/data" fi @@ -262,7 +262,7 @@ MAPS_DB=`${PSQL} -U awips -l | grep maps | awk '{print $1}'` if [ "${MAPS_DB}" = "maps" ]; then # drop the maps database - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${DROPDB} -U awips maps" >> ${SQL_LOG} fi @@ -272,19 +272,19 @@ MAPS_DIR=`${PSQL} -U awips -d postgres -c "\db" | grep maps | awk '{print $5}'` if [ ! "${MAPS_DIR}" = "" ]; then # drop the maps tablespace - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${PSQL} -U awips -d postgres -c \"DROP TABLESPACE maps\"" >> ${SQL_LOG} # remove the maps data directory that we created echo "Attempting To Removing Directory: ${MAPS_DIR}" if [ -d "${MAPS_DIR}" ]; then - su ${DB_OWNER} -c "rmdir ${MAPS_DIR}" + su - ${DB_OWNER} -c "rmdir ${MAPS_DIR}" fi fi # stop PostgreSQL if we started it if [ "${I_STARTED_POSTGRESQL}" = "YES" ]; then - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${PG_CTL} stop -D /awips2/data" sleep 2 fi diff --git a/rpms/awips2.core/Installer.ncep-database/component.spec b/rpms/awips2.core/Installer.ncep-database/component.spec index f63c36ecb6..8daa851894 100644 --- a/rpms/awips2.core/Installer.ncep-database/component.spec +++ b/rpms/awips2.core/Installer.ncep-database/component.spec @@ -89,7 +89,7 @@ LEGACY_SQL="/awips2/postgresql/share/contrib/postgis-2.0/legacy.sql" # Determine if PostgreSQL is running. I_STARTED_POSTGRESQL="NO" -su ${DB_OWNER} -c \ +su - ${DB_OWNER} -c \ "${PG_CTL} status -D ${AWIPS2_DATA_DIRECTORY} > /dev/null 2>&1" RC="$?" @@ -98,7 +98,7 @@ if [ ! "${RC}" = "0" ]; then echo "--------------------------------------------------------------------------------" echo "\| Starting PostgreSQL As User - ${DB_OWNER}..." echo "--------------------------------------------------------------------------------" - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${POSTMASTER} -D ${AWIPS2_DATA_DIRECTORY} > /dev/null 2>&1 &" RC="$?" if [ ! "${RC}" = "0" ]; then @@ -116,7 +116,7 @@ else echo "\| Found Running PostgreSQL Server..." echo "--------------------------------------------------------------------------------" # Show The User. - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${PG_CTL} status -D ${AWIPS2_DATA_DIRECTORY}" fi @@ -125,9 +125,9 @@ echo "-------------------------------------------------------------------------- echo "\| Creating a Directory for the ncep Tablespace..." echo "--------------------------------------------------------------------------------" if [ -d /awips2/data/ncep ]; then - su ${DB_OWNER} -c "rm -rf ${AWIPS2_DATA_DIRECTORY}/ncep" + su - ${DB_OWNER} -c "rm -rf ${AWIPS2_DATA_DIRECTORY}/ncep" fi -su ${DB_OWNER} -c "mkdir -p ${AWIPS2_DATA_DIRECTORY}/ncep" +su - ${DB_OWNER} -c "mkdir -p ${AWIPS2_DATA_DIRECTORY}/ncep" echo "--------------------------------------------------------------------------------" echo "\| Creating the ncep database..." @@ -140,25 +140,25 @@ perl -p -i -e "s/%{database_files_home}%/${AWIPS2_DATA_DIRECTORY_ESCAPED}/g" \ ${SQL_SHARE_DIR}/createNcepDb.sql -su ${DB_OWNER} -c \ +su - ${DB_OWNER} -c \ "${PSQL} -d postgres -U awips -q -p 5432 -f ${SQL_SHARE_DIR}/createNcepDb.sql" \ >> ${SQL_LOG} 2>&1 -su ${DB_OWNER} -c \ +su - ${DB_OWNER} -c \ "${PSQL} -d postgres -U awips -q -p 5432 -f ${SQL_SHARE_DIR}/createNcepSchemas.sql" \ >> ${SQL_LOG} 2>&1 -su ${DB_OWNER} -c \ +su - ${DB_OWNER} -c \ "${PSQL} -d ncep -U awips -q -p 5432 -c \"CREATE EXTENSION postgis;\"" >> ${SQL_LOG} 2>&1 -su ${DB_OWNER} -c \ +su - ${DB_OWNER} -c \ "${PSQL} -d ncep -U awips -q -p 5432 -c \"CREATE EXTENSION postgis_topology;\"" >> ${SQL_LOG} 2>&1 -su ${DB_OWNER} -c \ +su - ${DB_OWNER} -c \ "${PSQL} -d ncep -U awips -q -p 5432 -f ${LEGACY_SQL}" \ >> ${SQL_LOG} 2>&1 -su ${DB_OWNER} -c \ +su - ${DB_OWNER} -c \ "${SQL_SHARE_DIR}/createNcepDb.sh ${PSQL_INSTALL} 5432 awips ${SQL_SHARE_DIR} ${SQL_LOG}" -su ${DB_OWNER} -c \ +su - ${DB_OWNER} -c \ "${SQL_SHARE_DIR}/initializeNcepDb.sh ${POSTGRESQL_INSTALL} awips 5432 ${SQL_SHARE_DIR} ${SQL_LOG}" # stop PostgreSQL if we started it. @@ -167,7 +167,7 @@ if [ "${I_STARTED_POSTGRESQL}" = "YES" ]; then echo "--------------------------------------------------------------------------------" echo "\| Stopping PostgreSQL As User - ${DB_OWNER}..." echo "--------------------------------------------------------------------------------" - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${PG_CTL} stop -D /awips2/data" RC="$?" if [ ! "${RC}" = "0" ]; then @@ -204,7 +204,7 @@ echo "-------------------------------------------------------------------------- # start PostgreSQL if it is not running I_STARTED_POSTGRESQL="NO" -su ${DB_OWNER} -c \ +su - ${DB_OWNER} -c \ "${PG_CTL} status -D ${AWIPS2_DATA_DIRECTORY} > /dev/null 2>&1" RC="$?" @@ -213,7 +213,7 @@ if [ ! "${RC}" = "0" ]; then echo "--------------------------------------------------------------------------------" echo "\| Starting PostgreSQL As User - ${DB_OWNER}..." echo "--------------------------------------------------------------------------------" - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${POSTMASTER} -D ${AWIPS2_DATA_DIRECTORY} > /dev/null 2>&1 &" RC="$?" if [ ! "${RC}" = "0" ]; then @@ -228,7 +228,7 @@ else echo "\| Found Running PostgreSQL Server..." echo "--------------------------------------------------------------------------------" # Show The User. - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${PG_CTL} status -D ${AWIPS2_DATA_DIRECTORY}" fi @@ -236,7 +236,7 @@ echo "-------------------------------------------------------------------------- echo "\| Dropping ncep database..." echo "--------------------------------------------------------------------------------" -su ${DB_OWNER} -c \ +su - ${DB_OWNER} -c \ "${DROPDB} -U awips ncep" # Is there a ncep tablespace? @@ -247,13 +247,13 @@ if [ ! "${NCEP_DIR}" = "" ]; then echo "--------------------------------------------------------------------------------" echo "\| Dropping ncep tablespace..." echo "--------------------------------------------------------------------------------" - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${PSQL} -U awips -d postgres -c \"DROP TABLESPACE ncep\"" # remove the maps data directory that we created echo "Attempting To Remove Directory: ${NCEP_DIR}" if [ -d "${NCEP_DIR}" ]; then - su ${DB_OWNER} -c "rmdir ${NCEP_DIR}" + su - ${DB_OWNER} -c "rmdir ${NCEP_DIR}" fi fi @@ -263,7 +263,7 @@ if [ "${I_STARTED_POSTGRESQL}" = "YES" ]; then echo "--------------------------------------------------------------------------------" echo "\| Stopping PostgreSQL As User - ${DB_OWNER}..." echo "--------------------------------------------------------------------------------" - su ${DB_OWNER} -c \ + su - ${DB_OWNER} -c \ "${PG_CTL} stop -D ${AWIPS2_DATA_DIRECTORY}" RC="$?" if [ ! "${RC}" = "0" ]; then