Fix run of pgpro_upgrade with data_directory in the postgresql.conf

vbwagner · vbwagner · commit f8ffcd4aaf4d · 2017-08-30T17:57:31.000+03:00
diff --git a/src/pgpro-upgrade/pgpro_upgrade b/src/pgpro-upgrade/pgpro_upgrade
@@ -30,26 +30,26 @@ esac
 # Check the catalog version
 CATALOG_VERSION_NO=2016081311
 MAJORVER=9.6
+if [ ! -f "${PGDATA}/global/pg_control" -a -f "${PGDATA}/postgresql.conf" ]; then
+	# looks like we have Debian with separate directory for configs
+	SAVE_PGDATA="$PGDATA"
+	PGDATA=`sed -n "/data_directory/{s/^data_directory = '//
+	s/'.*$//
+	p}" ${PGDATA}/postgresql.conf`
+	if [ -z "$PGDATA" -o ! -f "${PGDATA}/global/pg_control" ]; then
+		echo "Cannot find valid database in $PGDATA" 1>&2;
+		exit 1
+	fi
+fi
 CATVER=`${PGBIN}pg_controldata|sed -n '/Catalog version number:/s/^.*: *//p'`
 if [ "$CATVER" != $CATALOG_VERSION_NO ]; then
     if [ -n "$check" ]; then
         echo "Database needs upgrade"
         exit 1
     fi
-	if [ ! -f "${PGDATA}/global/pg_control" ]; then
-		# looks like we have Debian with separate directory for configs
-		SAVE_PGDATA="$PGDATA"
-		PGDATA=`sed -n "/data_directory/{s/^data_directory = '//
-		s/'.*$//
-		p}" /etc/postgresql/9.6/main/postgresql.conf`
-		if [ -z "$PGDATA" -o ! -f "${PGDATA}/global/pg_control" ]; then
-			echo "Cannot find valid database in $PGDATA" 1>&2;
-			exit 1
-		fi
-		if [ -f "$PGDATA/postmaster.pid" ]; then
-			echo "postmaster.pid exists. Is another backend running on $PGDATA" 1>&2; 
-			exit 1;
-		fi
+	if [ -f "$PGDATA/postmaster.pid" ]; then
+		echo "postmaster.pid exists. Is another backend running on $PGDATA" 1>&2; 
+		exit 1;
 	fi
 	# Fix pg_control file
 	"${PGBIN}pg_controldata" -c
@@ -60,11 +60,11 @@ if [ "$CATVER" != $CATALOG_VERSION_NO ]; then
 		(cd $i; mv PG_${MAJORVER}_$CATVER PG_${MAJORVER}_$CATALOG_VERSION_NO)
 	 done
 	)
-	if [ -n "$SAVE_PGDATA" ]; then
-		PGDATA="$SAVE_PGDATA"
-	fi
 fi
 
+if [ -n "$SAVE_PGDATA" ]; then
+	PGDATA="$SAVE_PGDATA"
+fi
 
 for dir in "$PGSHARE" /usr/pgsql-9.6/share /usr/share/postgresql/9.6 /usr/pgsql/9.6/share /usr/share/pgsql /usr/share/postgrespro96  ; do
 	if [ -d "$dir/pgpro-upgrade" ]; then
