[patch] monetdb-proposal.diff

monetdb-proposal.diff (text/plain), 3.26 KB, created by Matthew Kennedy (RETIRED) on 2005-07-30 17:48:51 UTC

--- monetdb-4.8.0.ebuild	2005-06-01 13:50:44.000000000 -0500
+++ /usr/portage/dev-db/monetdb/monetdb-4.8.0.ebuild	2005-07-30 19:43:49.000000000 -0500
@@ -29,25 +29,33 @@
 
 pkg_setup() {
 	if [ -x ${DATA_DIR}/dbfarm ] || [ -x ${DATA_DIR}/log ]; then
-		eerror "MonetDB ${MY_PV} cannot upgrade your existing SQL databases."
-		eerror "You must export your existing SQL databases to a file using"
-		eerror "\"JdbcClient -D\" and then restore them when you have upgraded"
-		eerror "completey using \"JdbcClient -f\"."
-		eerror "If you have MIL BATs, your have to convert those after"
-		eerror "upgrading."
-		eerror "See http://monetdb.cwi.nl/TechDocs/FrontEnds/SQL/upgrade/"
-		eerror "and http://monetdb.cwi.nl/TechDocs/FrontEnds/mil/upgrade/"
-		eerror "for more information on upgrading from previous database"
-		eerror "versions."
-		eerror "You must remove your entire database directory to continue."
-		eerror "(database directory = ${DATA_DIR})"
-		exit 1
+		while read line; do error "${line}"; done <<EOF
+
+MonetDB ${MY_PV} cannot upgrade your existing SQL databases.  You must
+export your existing SQL databases to a file using "JdbcClient -D" and
+then restore them when you have upgraded completey using "JdbcClient
+-f".
+
+If you have MIL BATs, your have to convert those after upgrading.  See
+the following for more information on upgrading from previous database
+versions:
+
+http://monetdb.cwi.nl/TechDocs/FrontEnds/SQL/upgrade/
+http://monetdb.cwi.nl/TechDocs/FrontEnds/mil/upgrade/
+
+
+You must remove your entire database directory to continue.	 (database
+directory = ${DATA_DIR}).
+EOF
+		die "Cannot upgrade automatically."
 	fi
+
+	enewgroup monetdb
+	enewuser monetdb -1 /bin/bash ${DATA_DIR} monetdb
 }
 
 src_unpack() {
 	unpack ${A} || die
-
 	epatch ${FILESDIR}/monetdb-${PV}-gentoo-conf.patch
 	epatch ${FILESDIR}/monetdb-${PV}-gentoo-MapiClient.patch
 }
@@ -144,27 +152,24 @@
 
 	insinto ${DATA_DIR}
 	newins ${FILESDIR}/${PN}-${PV}-startup.mil ${PN}-startup.mil || die "startup MIL script"
-}
 
-pkg_preinst() {
-	enewgroup monetdb
-	enewuser monetdb -1 /bin/bash ${DATA_DIR} monetdb
+	chown -R monetdb:monetdb ${D}/${DATA_DIR}
+	fowners monetdb:monetdb /var/log/${PN}
 }
 
 pkg_postinst() {
-	chown monetdb:monetdb ${DATA_DIR}/
-	chown -R monetdb:monetdb ${DATA_DIR}/*
-	chown -R monetdb:monetdb /var/log/${PN}
-
-	einfo "MonetDB has been installed on your system, using data directory"
-	einfo ${DATA_DIR}.
-	einfo ""
-	einfo "To get started using SQL, XQuery or MIL see"
-	einfo "http://monetdb.cwi.nl/GettingStarted/."
-	einfo ""
-	einfo "If you have upgraded from version 4.6.2 or below you should"
-	einfo "restore your SQL databases, as well as convert your MIL"
-	einfo "BATs."
-	einfo "See http://monetdb.cwi.nl/TechDocs/FrontEnds/SQL/upgrade/"
-	einfo "and http://monetdb.cwi.nl/TechDocs/FrontEnds/mil/upgrade/"
+	while read line; do einfo "${line}"; done <<EOF
+
+MonetDB has been installed on your system, using data directory
+${DATA_DIR}.  To get started using SQL, XQuery or MIL see:
+
+http://monetdb.cwi.nl/GettingStarted/
+
+If you have upgraded from version 4.6.2 or below you should restore your
+SQL databases, as well as convert your MIL BATs.  See also:
+
+http://monetdb.cwi.nl/TechDocs/FrontEnds/SQL/upgrade/
+http://monetdb.cwi.nl/TechDocs/FrontEnds/mil/upgrade/
+
+EOF
 }