Moved conf-file creation to pkg_preinst.

svn path=/testing/; revision=66

4 files changed, 65 insertions, 56 deletions

diff --git a/net-www/vdradmin-am/ChangeLog b/net-www/vdradmin-am/ChangeLog
index 0ab548b..efc21e8 100644
--- a/net-www/vdradmin-am/ChangeLog
+++ b/net-www/vdradmin-am/ChangeLog
@@ -3,6 +3,10 @@
 # $Header: $
 
   01 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
+  vdradmin-am-3.4.7-r1.ebuild, vdradmin-am-3.5.0_beta.ebuild:
+  Moved conf-file creation to pkg_preinst.
+
+  01 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
   vdradmin-am-3.5.0_beta.ebuild:
   Nicer output.
 
diff --git a/net-www/vdradmin-am/Manifest b/net-www/vdradmin-am/Manifest
index f92f5e1..05792ca 100644
--- a/net-www/vdradmin-am/Manifest
+++ b/net-www/vdradmin-am/Manifest
@@ -16,26 +16,22 @@ RMD160 f6d0a31c424c6a45d8786d2b98e9872e5e3ded5f files/vdradmin-am-config-autoflu
 SHA256 1687001c6114cb373643982fb73a78e7656c70d253e9ff0d89b7ed466133f950 files/vdradmin-am-config-autoflush.diff 654
 DIST vdradmin-am-3.4.7.tar.bz2 506628 RMD160 04413c1a767c668f0bb8d68dfe016fa449d06be6 SHA1 616b1e6d977fdcc20157030ab317e470cc5b2655 SHA256 46a07e9aed77d533a0e4045a733962db36beab025c7eb297eda0c0ec41d6f1c9
 DIST vdradmin-am-3.5.0beta.tar.bz2 501712 RMD160 8e8afe8cef6768c099640f489dd7626775d36691 SHA1 968722455b0de35c80e65575bdd2dd36cdf42b07 SHA256 9c664e55a0316cdb71edd5e40c1fd49caa38455a75c631f30dfe12b051e80445
-EBUILD vdradmin-am-3.4.7-r1.ebuild 3226 RMD160 560820a1fff01346a6993167758c296aa7f5838b SHA1 ca60b9179ce50ffcc5065e92140b27ee56b2abaf SHA256 08fab2525bcae97f9ede853bd300d27c57edfa3c91a3e5cdebc8bfef1e843568
-MD5 af1ae8dd6137d29e7e756ec22662b59a vdradmin-am-3.4.7-r1.ebuild 3226
-RMD160 560820a1fff01346a6993167758c296aa7f5838b vdradmin-am-3.4.7-r1.ebuild 3226
-SHA256 08fab2525bcae97f9ede853bd300d27c57edfa3c91a3e5cdebc8bfef1e843568 vdradmin-am-3.4.7-r1.ebuild 3226
-EBUILD vdradmin-am-3.5.0_beta.ebuild 4387 RMD160 910e20a511681766f019c2c6f6039b1b45927527 SHA1 d02792b9eabff8fdb9afd65111fcdf7b86210e6d SHA256 07a0f6da88a9ea4ff6eb10fd2760733a30710274c98fc5437adfb7c85aa23eef
-MD5 0bc985f609a13cbfddf769790c2690cc vdradmin-am-3.5.0_beta.ebuild 4387
-RMD160 910e20a511681766f019c2c6f6039b1b45927527 vdradmin-am-3.5.0_beta.ebuild 4387
-SHA256 07a0f6da88a9ea4ff6eb10fd2760733a30710274c98fc5437adfb7c85aa23eef vdradmin-am-3.5.0_beta.ebuild 4387
-MISC ChangeLog 1502 RMD160 c59419b9e116f8d9d822f50308f6142fb143640f SHA1 dd3718b5aa830a9903434c22ed743a6cfe684879 SHA256 e5399741f8940c37aaf81ce7c6cb6e568ba41cbf12ced1ad7126e40b3b842e54
-MD5 afd4890f1c854b259496dd5b255add01 ChangeLog 1502
-RMD160 c59419b9e116f8d9d822f50308f6142fb143640f ChangeLog 1502
-SHA256 e5399741f8940c37aaf81ce7c6cb6e568ba41cbf12ced1ad7126e40b3b842e54 ChangeLog 1502
+EBUILD vdradmin-am-3.4.7-r1.ebuild 3303 RMD160 bef7984a108d4dd37687e757ea625c83b258d7e0 SHA1 67cb930f728e3e4bd6a6fa92454b88e6079682f7 SHA256 5263f8c3d8d0728e036f9e21c0c68e18fce96b31340b1a55d857456db0397088
+MD5 ba57f50bb76a356c6a77a1ebae23138a vdradmin-am-3.4.7-r1.ebuild 3303
+RMD160 bef7984a108d4dd37687e757ea625c83b258d7e0 vdradmin-am-3.4.7-r1.ebuild 3303
+SHA256 5263f8c3d8d0728e036f9e21c0c68e18fce96b31340b1a55d857456db0397088 vdradmin-am-3.4.7-r1.ebuild 3303
+EBUILD vdradmin-am-3.5.0_beta.ebuild 4465 RMD160 8eda2e987e0306e7bf831fbffd75083aae1c35aa SHA1 70ca02651a66f49d3fb206755acb9d780d65962a SHA256 cf78927cd73345bb02c4e8ae8cc8c3ad6fd8c2e7a7dc0af28b99d1ca852b0dc2
+MD5 d72b36ffd2173ea32222e7f5c5356e94 vdradmin-am-3.5.0_beta.ebuild 4465
+RMD160 8eda2e987e0306e7bf831fbffd75083aae1c35aa vdradmin-am-3.5.0_beta.ebuild 4465
+SHA256 cf78927cd73345bb02c4e8ae8cc8c3ad6fd8c2e7a7dc0af28b99d1ca852b0dc2 vdradmin-am-3.5.0_beta.ebuild 4465
+MISC ChangeLog 1764 RMD160 b6e91098c72cf3de3c5af4b13494cd8db309d855 SHA1 53322d2a23bcb7f8c15288892192954a1fc9b4e0 SHA256 b1b0ff06ddeecb02f8d9503094b295fca43360fdae074feaa6decba468def81e
+MD5 bbdbe1ee4dcef8acdd537d16fece6c7c ChangeLog 1764
+RMD160 b6e91098c72cf3de3c5af4b13494cd8db309d855 ChangeLog 1764
+SHA256 b1b0ff06ddeecb02f8d9503094b295fca43360fdae074feaa6decba468def81e ChangeLog 1764
 MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f
 MD5 3cafef7c72bb98475ad53d15e79ff845 metadata.xml 251
 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 metadata.xml 251
 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f metadata.xml 251
-MISC vdradmin-am-3.5.0_beta.ebuild.rej 811 RMD160 ddb8e38ff9e5f997d0ef60993c276813c9b83f7f SHA1 9474eb8aea7d8961ad9e54d37edc8f25d1e48a33 SHA256 dc137a8e1b65d1522ac8496526120ebacab07295caefb701391de6448c3a68dd
-MD5 4bcf47e262d7aca29fce69fc01fb0214 vdradmin-am-3.5.0_beta.ebuild.rej 811
-RMD160 ddb8e38ff9e5f997d0ef60993c276813c9b83f7f vdradmin-am-3.5.0_beta.ebuild.rej 811
-SHA256 dc137a8e1b65d1522ac8496526120ebacab07295caefb701391de6448c3a68dd vdradmin-am-3.5.0_beta.ebuild.rej 811
 MD5 45cf1c2faf63e70d5bc0267ded5784af files/digest-vdradmin-am-3.4.7-r1 256
 RMD160 4470aa33d90fd5351062e42eff7e83830eb507ae files/digest-vdradmin-am-3.4.7-r1 256
 SHA256 6ebb2dc5335b44c8c533e8015d138f5670b480fd230f3cf22b20ce3cc6147436 files/digest-vdradmin-am-3.4.7-r1 256
diff --git a/net-www/vdradmin-am/vdradmin-am-3.4.7-r1.ebuild b/net-www/vdradmin-am/vdradmin-am-3.4.7-r1.ebuild
index 4b0bf78..a4809db 100644
--- a/net-www/vdradmin-am/vdradmin-am-3.4.7-r1.ebuild
+++ b/net-www/vdradmin-am/vdradmin-am-3.4.7-r1.ebuild
@@ -83,27 +83,14 @@ src_install() {
 	dosed "s:FILES_IN_SYSTEM    = 0;:FILES_IN_SYSTEM    = 1;:g" /usr/bin/vdradmind.pl
 }
 
-pkg_postinst() {
-	if [[ -d ${ROOT}${ETC_DIR} ]]; then
-		local owner=$(stat ${ROOT}${ETC_DIR} -c "%U")
-		if [[ ${owner} != vdradmin ]]; then
-			einfo "Changing ownership of ${ETC_DIR}."
-			chown -R ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}
-		fi
-	fi
-
-	if [[ -d ${ROOT}/tmp/usr/share/vdradmin ]]; then
-		ewarn "You have a leftover directory of vdradmin."
-		ewarn "You can safely remove it with:"
-		ewarn "# rm -rf /tmp/usr/share/vdradmin/template"
-		ewarn "# rmdir -p /tmp/usr/share/vdradmin"
-	fi
-
-	if [[ ! -f ${ROOT}${ETC_DIR}/vdradmind.conf ]]; then
+pkg_preinst() {
+	if [[ -f ${ROOT}${ETC_DIR}/vdradmind.conf ]]; then
+		cp ${ROOT}${ETC_DIR}/vdradmind.conf ${D}${ETC_DIR}/vdradmind.conf
+	else
 		einfo "Creating a new config-file."
 		echo
 
-		cat <<-EOF > ${ROOT}${ETC_DIR}/vdradmind.conf
+		cat <<-EOF > ${D}${ETC_DIR}/vdradmind.conf
 			VDRCONFDIR = /etc/vdr
 			VIDEODIR = /var/vdr/video
 			PASSWORD = gentoo-vdr
@@ -111,10 +98,9 @@ pkg_postinst() {
 		EOF
 		# feed it with newlines
 		yes "" \
-		  | ${ROOT}/usr/bin/vdradmind.pl --cfgdir ${ROOT}${ETC_DIR} --config \
+		  | ${D}/usr/bin/vdradmind.pl --cfgdir ${D}${ETC_DIR} --config \
 		  |sed -e 's/: /: \n/g'
 
-		chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}/vdradmind.conf
 		einfo
 		einfo "Created default user/password: gentoo-vdr/gentoo-vdr"
 		einfo
@@ -123,6 +109,24 @@ pkg_postinst() {
 		einfo "installation or change it in Setup-Menu of Web-Interface."
 		echo
 	fi
+	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${D}${ETC_DIR}/vdradmind.conf
+}
+
+pkg_postinst() {
+	if [[ -d ${ROOT}${ETC_DIR} ]]; then
+		local owner=$(stat ${ROOT}${ETC_DIR} -c "%U")
+		if [[ ${owner} != vdradmin ]]; then
+			einfo "Changing ownership of ${ETC_DIR}."
+			chown -R ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}
+		fi
+	fi
+
+	if [[ -d ${ROOT}/tmp/usr/share/vdradmin ]]; then
+		ewarn "You have a leftover directory of vdradmin."
+		ewarn "You can safely remove it with:"
+		ewarn "# rm -rf /tmp/usr/share/vdradmin/template"
+		ewarn "# rmdir -p /tmp/usr/share/vdradmin"
+	fi
 }
 
 pkg_config() {
diff --git a/net-www/vdradmin-am/vdradmin-am-3.5.0_beta.ebuild b/net-www/vdradmin-am/vdradmin-am-3.5.0_beta.ebuild
index 6539190..e785834 100644
--- a/net-www/vdradmin-am/vdradmin-am-3.5.0_beta.ebuild
+++ b/net-www/vdradmin-am/vdradmin-am-3.5.0_beta.ebuild
@@ -89,27 +89,14 @@ src_install() {
 	dosed "s:FILES_IN_SYSTEM    = 0;:FILES_IN_SYSTEM    = 1;:g" /usr/bin/vdradmind.pl
 }
 
-pkg_postinst() {
-	if [[ -d ${ROOT}${ETC_DIR} ]]; then
-		local owner=$(stat ${ROOT}${ETC_DIR} -c "%U")
-		if [[ ${owner} != vdradmin ]]; then
-			einfo "Changing ownership of ${ETC_DIR}."
-			chown -R ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}
-		fi
-	fi
-
-	if [[ -d ${ROOT}/tmp/usr/share/vdradmin ]]; then
-		ewarn "You have a leftover directory of vdradmin."
-		ewarn "You can safely remove it with:"
-		ewarn "# rm -rf /tmp/usr/share/vdradmin/template"
-		ewarn "# rmdir -p /tmp/usr/share/vdradmin"
-	fi
-
-	if [[ ! -f ${ROOT}${ETC_DIR}/vdradmind.conf ]]; then
+pkg_preinst() {
+	if [[ -f ${ROOT}${ETC_DIR}/vdradmind.conf ]]; then
+		cp ${ROOT}${ETC_DIR}/vdradmind.conf ${D}${ETC_DIR}/vdradmind.conf
+	else
 		einfo "Creating a new config-file."
 		echo
 
-		cat <<-EOF > ${ROOT}${ETC_DIR}/vdradmind.conf
+		cat <<-EOF > ${D}${ETC_DIR}/vdradmind.conf
 			VDRCONFDIR = /etc/vdr
 			VIDEODIR = /var/vdr/video
 			PASSWORD = gentoo-vdr
@@ -117,10 +104,9 @@ pkg_postinst() {
 		EOF
 		# feed it with newlines
 		yes "" \
-		  | ${ROOT}/usr/bin/vdradmind.pl --cfgdir ${ROOT}${ETC_DIR} --config \
+		  | ${D}/usr/bin/vdradmind.pl --cfgdir ${D}${ETC_DIR} --config \
 		  |sed -e 's/: /: \n/g'
 
-		chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}/vdradmind.conf
 		einfo
 		einfo "Created default user/password: gentoo-vdr/gentoo-vdr"
 		einfo
@@ -129,6 +115,25 @@ pkg_postinst() {
 		einfo "installation or change it in Setup-Menu of Web-Interface."
 		echo
 	fi
+	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${D}${ETC_DIR}/vdradmind.conf
+}
+
+pkg_postinst() {
+	if [[ -d ${ROOT}${ETC_DIR} ]]; then
+		local owner=$(stat ${ROOT}${ETC_DIR} -c "%U")
+		if [[ ${owner} != vdradmin ]]; then
+			einfo "Changing ownership of ${ETC_DIR}."
+			chown -R ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}
+		fi
+	fi
+
+	if [[ -d ${ROOT}/tmp/usr/share/vdradmin ]]; then
+		ewarn "You have a leftover directory of vdradmin."
+		ewarn "You can safely remove it with:"
+		ewarn "# rm -rf /tmp/usr/share/vdradmin/template"
+		ewarn "# rmdir -p /tmp/usr/share/vdradmin"
+	fi
+
 	local DEST=/etc/vdr/plugins/epgsearch/epgsearch.conf
 	local SOURCE=${ETC_DIR}/vdradmind.at
 	if [[ -s ${ROOT}${SOURCE} ]]; then