iterating toward working myth2ipod and myt2xvid3 packages

4 files changed, 21 insertions, 19 deletions

diff --git a/abs/extra-testing/myt2xvid3/PKGBUILD b/abs/extra-testing/myt2xvid3/PKGBUILD
index 231d0b3..dd12733 100755
--- a/abs/extra-testing/myt2xvid3/PKGBUILD
+++ b/abs/extra-testing/myt2xvid3/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=myt2xvid3
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 arch=("i686")
 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
 url="http://www.knoppmythwiki.org/index.php?page=XvidEncoding"
@@ -12,8 +12,7 @@ source=( myt2xvid3 myt2xvid3-userjob.sh archive.php)
 build() {
 	cd $startdir/src
 	install -D -m 755 myt2xvid3 $startdir/pkg/usr/bin/myt2xvid3
-	install -D -m 755 myt2xvid3-userjob.sh /$startdir/pkg/usr/bin/myt2xvid3-userjob.sh
-	install -D -m 755 archive.php /myth/video/archive/archive.php
-
-
+	install -D -m 755 myt2xvid3-userjob.sh $startdir/pkg/usr/bin/myt2xvid3-userjob.sh
+	mkdir -m755 -p $startdir/pkg/myth/video/archive/
+	install -D -m 755 archive.php $startdir/pkg/myth/video/archive/
 }
diff --git a/abs/extra-testing/myt2xvid3/myt2xvid3.install b/abs/extra-testing/myt2xvid3/myt2xvid3.install
index f363fa2..19d050d 100755
--- a/abs/extra-testing/myt2xvid3/myt2xvid3.install
+++ b/abs/extra-testing/myt2xvid3/myt2xvid3.install
@@ -1,6 +1,7 @@
 
 pre_install() {
-	echo ""
+	mkdir -p /myth/video/archive
+	chown mythtv:http /myth/video/archive
 }
 
 pre_upgrade() {
@@ -13,9 +14,8 @@ pre_remove() {
 
 post_install() {
 	. /etc/systemconfig
-	mkdir /myth/video/archive
-	chown mythtv:users /myth/video/archive
 	ln -s /myth/video/archive /data/srv/httpd/htdocs/archive
+	ln -s /myth/video/archive/archive.php /myth/video/archive/index.php
 	mv /usr/bin/myt2xvid3 /tmp
 	sed -e "s/REPLACEME/$HOSTNAME/g" /tmp/myt2xvid3 > /usr/bin/myt2xvid3
 	chown -R mythtv:http /myth/video/archive
@@ -26,7 +26,10 @@ post_upgrade() {
 }
 
 post_remove() {
- 	rm -fr /data/srv/http/htdocs/archive 
+ 	rm -fr /data/srv/http/htdocs/archive
+	rm -rf /myth/video/archive/index.php
+	rm -rf /myth/video/archive/archive.php
+	# don't delete content that the user may still want, so leave /myth/video/archive
 }
 
 op=$1
diff --git a/abs/extra-testing/myth2ipod/PKGBUILD b/abs/extra-testing/myth2ipod/PKGBUILD
index bfb7c91..8bc7811 100755
--- a/abs/extra-testing/myth2ipod/PKGBUILD
+++ b/abs/extra-testing/myth2ipod/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=myth2ipod
 pkgver=0.2
-pkgrel=18
+pkgrel=24
 arch=("i686")
 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
 url="myth2ipod.com"
@@ -14,7 +14,6 @@ build() {
 	install -D -m 755 myth2ipod $startdir/pkg/usr/bin/myth2ipod
 	install -D -m 755 myth2ipod-userjob.sh /$startdir/pkg/usr/bin/myth2ipod-userjob.sh
 	install -D -m755 iPod.pm $startdir/pkg/usr/share/nuvexport/export/ffmpeg/iPod.pm
-	install -D -m755 m2iweb.php $startdir/pkg/myth/ipodfeed
-
-
+	mkdir -m755 -p $startdir/pkg/myth/ipodfeed
+	install -D -m755 m2iweb.php $startdir/pkg/myth/ipodfeed/
 }
diff --git a/abs/extra-testing/myth2ipod/myth2ipod.install b/abs/extra-testing/myth2ipod/myth2ipod.install
index 4a7e046..9b9239a 100755
--- a/abs/extra-testing/myth2ipod/myth2ipod.install
+++ b/abs/extra-testing/myth2ipod/myth2ipod.install
@@ -1,6 +1,7 @@
 
 pre_install() {
-	echo ""
+	mkdir -p /myth/ipodfeed
+	chown mythtv:http /myth/ipodfeed
 }
 
 pre_upgrade() {
@@ -13,14 +14,11 @@ pre_remove() {
 
 post_install() {
 	. /etc/systemconfig
-	mkdir /myth/ipodfeed
-	chown mythtv:users /myth/ipodfeed
 	ln -s /myth/ipodfeed /data/srv/httpd/htdocs/ipodfeed
+	ln -s /myth/ipodfeed/m2iweb.php /myth/ipodfeed/index.php
 	cp /usr/bin/myth2ipod /tmp
 	sed -e "s/REPLACEME/$hostname/g" /tmp/myth2ipod > /usr/bin/myth2ipod
 	chown -R mythtv:http /myth/ipodfeed
-	
-	
 }
 
 post_upgrade() {
@@ -28,7 +26,10 @@ post_upgrade() {
 }
 
 post_remove() {
- 	rm -fr /data/srv/httpd/htdocs/ipodfeed 
+ 	rm -fr /data/srv/httpd/htdocs/ipodfeed
+	rm -rf /myth/ipodfeed/m2iweb.php
+	rm -rf /myth/ipodfeed/index.php
+	# don't delete content that the user may still want, so leave /myth/ipodfeed
 }
 
 op=$1