[patch] respect PG_AUTOCONFIG

pg_autoconfig.txt (text/plain), 5.71 KB, created by Austin English (RETIRED) on 2017-02-28 00:58:30 UTC

diff --git a/dev-db/postgresql/postgresql-9.5.5.ebuild b/dev-db/postgresql/postgresql-9.5.5.ebuild
index 67836d7..66395fd 100644
--- a/dev-db/postgresql/postgresql-9.5.5.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.5.ebuild
@@ -351,17 +351,22 @@ pkg_config() {
 	einfo "The database cluster will be created in:"
 	einfo "    ${DATA_DIR}"
 	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
+
+	if [ -z "$PG_AUTOCONFIG" ] ; then
+		while [ "$correct" != "true" ] ; do
+			einfo "Are you ready to continue? (y/n)"
+			read answer
+			if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+				correct="true"
+			elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+				die "Aborting initialization."
+			else
+				echo "Answer not recognized"
+			fi
+		done
+	else
+		einfo "PG_AUTOCONFIG set, not prompting"
+	fi
 
 	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
 		eerror "The given directory, '${DATA_DIR}', is not empty."
diff --git a/dev-db/postgresql/postgresql-9.5.6.ebuild b/dev-db/postgresql/postgresql-9.5.6.ebuild
index 2bebb88..a909a19 100644
--- a/dev-db/postgresql/postgresql-9.5.6.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.6.ebuild
@@ -351,17 +351,21 @@ pkg_config() {
 	einfo "The database cluster will be created in:"
 	einfo "    ${DATA_DIR}"
 	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
+	if [ -z "$PG_AUTOCONFIG" ] ; then
+		while [ "$correct" != "true" ] ; do
+			einfo "Are you ready to continue? (y/n)"
+			read answer
+			if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+				correct="true"
+			elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+				die "Aborting initialization."
+			else
+				echo "Answer not recognized"
+			fi
+		done
+	else
+		einfo "PG_AUTOCONFIG set, not prompting"
+	fi
 
 	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
 		eerror "The given directory, '${DATA_DIR}', is not empty."
diff --git a/dev-db/postgresql/postgresql-9.6.1-r1.ebuild b/dev-db/postgresql/postgresql-9.6.1-r1.ebuild
index 1f7b879..fc1ba78 100644
--- a/dev-db/postgresql/postgresql-9.6.1-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.1-r1.ebuild
@@ -348,17 +348,21 @@ pkg_config() {
 	einfo "The database cluster will be created in:"
 	einfo "    ${DATA_DIR}"
 	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
+	if [ -z "$PG_AUTOCONFIG" ] ; then
+		while [ "$correct" != "true" ] ; do
+			einfo "Are you ready to continue? (y/n)"
+			read answer
+			if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+				correct="true"
+			elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+				die "Aborting initialization."
+			else
+				echo "Answer not recognized"
+			fi
+		done
+	else
+		einfo "PG_AUTOCONFIG set, not prompting"
+	fi
 
 	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
 		eerror "The given directory, '${DATA_DIR}', is not empty."
diff --git a/dev-db/postgresql/postgresql-9.6.2.ebuild b/dev-db/postgresql/postgresql-9.6.2.ebuild
index ce1d144..970292d 100644
--- a/dev-db/postgresql/postgresql-9.6.2.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.2.ebuild
@@ -348,17 +348,21 @@ pkg_config() {
 	einfo "The database cluster will be created in:"
 	einfo "    ${DATA_DIR}"
 	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
+	if [ -z "$PG_AUTOCONFIG" ] ; then
+		while [ "$correct" != "true" ] ; do
+			einfo "Are you ready to continue? (y/n)"
+			read answer
+			if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+				correct="true"
+			elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+				die "Aborting initialization."
+			else
+				echo "Answer not recognized"
+			fi
+		done
+	else
+		einfo "PG_AUTOCONFIG set, not prompting"
+	fi
 
 	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
 		eerror "The given directory, '${DATA_DIR}', is not empty."
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index 526926a..29c2e71e 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -298,17 +298,21 @@ pkg_config() {
 	einfo "The database cluster will be created in:"
 	einfo "    ${DATA_DIR}"
 	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
+	if [ -z "$PG_AUTOCONFIG" ] ; then
+		while [ "$correct" != "true" ] ; do
+			einfo "Are you ready to continue? (y/n)"
+			read answer
+			if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+				correct="true"
+			elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+				die "Aborting initialization."
+			else
+				echo "Answer not recognized"
+			fi
+		done
+	else
+		einfo "PG_AUTOCONFIG set, not prompting"
+	fi
 
 	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
 		eerror "The given directory, '${DATA_DIR}', is not empty."