From: Austin English Date: Mon, 3 Apr 2017 20:51:52 +0000 (-0500) Subject: dev-db/postgresql: respect PG_AUTOCONFIG env variable X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=315323499fa5e267317d413318481e7cfec8d7c9;p=gentoo.git dev-db/postgresql: respect PG_AUTOCONFIG env variable This allows configuring postgresql without further input from the input (i.e., makes it scriptable). Gentoo-Bug: https://bugs.gentoo.org/610418 --- diff --git a/dev-db/postgresql/postgresql-9.5.5.ebuild b/dev-db/postgresql/postgresql-9.5.5.ebuild index b352149ac96d..56cafc185c77 100644 --- a/dev-db/postgresql/postgresql-9.5.5.ebuild +++ b/dev-db/postgresql/postgresql-9.5.5.ebuild @@ -350,17 +350,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 8e8412b1fc7a..eb493f3f3929 100644 --- a/dev-db/postgresql/postgresql-9.5.6.ebuild +++ b/dev-db/postgresql/postgresql-9.5.6.ebuild @@ -350,17 +350,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 0c0ba8278ade..0e4412b472c2 100644 --- a/dev-db/postgresql/postgresql-9.6.1-r1.ebuild +++ b/dev-db/postgresql/postgresql-9.6.1-r1.ebuild @@ -347,17 +347,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 0c0ba8278ade..0e4412b472c2 100644 --- a/dev-db/postgresql/postgresql-9.6.2.ebuild +++ b/dev-db/postgresql/postgresql-9.6.2.ebuild @@ -347,17 +347,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 b1d337683362..6a995c154baa 100644 --- a/dev-db/postgresql/postgresql-9999.ebuild +++ b/dev-db/postgresql/postgresql-9999.ebuild @@ -297,17 +297,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."