remove all relative path

1 files changed, 52 insertions, 40 deletions

diff --git a/create_dual.sh b/create_dual.sh
index 9797ed9..410467c 100755
--- a/create_dual.sh
+++ b/create_dual.sh
@@ -1,49 +1,64 @@
 #!/bin/sh
 
+DISTRIB=mandriva-linux-free
 TAG=farman
 VERSION=2010-spring
 VV=2010.1
+MEDIAMAIN=media/main
+PIECES=/mnt/pieces/pieces/
+BUILDPATH="$HOME/build_bcd/build/$DISTRIB-$VERSION"
+BUILDISOPATH="$HOME/build_bcd/iso/$DISTRIB-$VERSION"
+
+# genisoimage options
+AGENISO="$DISTRIB - 2010 Spring (Free)"
+PUBLISHER="Mandriva"
+SYSID="$PUBLISHER Linux"
+TOOL="$SYSID BCD"
+VOLSET="$SYSID 2010 Spring (Free) - DUAL CD"
+VOLUME="FREE-2010S-DUAL"
+
 
 ./bcd.pl dual.xml all copy noiso nodoble
 ./bcd.pl dual64.xml all copy noiso nodoble
 
-rm -vf $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-i586/i586/install/images/boot.iso
-rm -rvf $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-i586/i586/install/images/alternatives
-rm -vf $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64/install/images/boot.iso
-rm -vrf $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64/install/images/alternatives
+rm -vf $BUILDPATH-i586/i586/install/images/boot.iso
+rm -rvf $BUILDPATH-i586/i586/install/images/alternatives
+rm -vf $BUILDPATH-x86_64/x86_64/install/images/boot.iso
+rm -vrf $BUILDPATH-x86_64/x86_64/install/images/alternatives
 
 sync
 
-du -sh $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-i586/i586
-du -sh $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64
+du -sh $BUILDPATH-i586/i586
+du -sh $BUILDPATH-x86_64/x86_64
+
+rm -rf $BUILDPATH
+rm -rvf $BUILDISOPATH
+mkdir -p $BUILDPATH
+mkdir -p $BUILDISOPATH
 
-rm -rf $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION
-rm -rvf $HOME/build_bcd/iso/mandriva-linux-free-dual-$VERSION
-mkdir -p $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION
-mkdir -p $HOME/build_bcd/iso/mandriva-linux-free-dual-$VERSION
+cp -af $BUILDPATH-i586/i586 $BUILDPATH
+cp -af $BUILDPATH-x86_64/x86_64 $BUILDPATH
 
-cp -af $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-i586/i586 $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION
-cp -af $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64 $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION
+cp -af $PIECES/$VV/i586/dosutils $BUILDPATH
+cp -af $PIECES/$VV/i586/autorun.inf $BUILDPATH
 
-cp -af /mnt/pieces/pieces/$VV/i586/dosutils $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/
-cp -af /mnt/pieces/pieces/$VV/i586/autorun.inf $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/
+cd $BUILDPATH/x86_64/$MEDIAMAIN
 
-cd $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/x86_64/media/main
 
 for i in *noarch.rpm
 do
-	if [ -f "../../../i586/media/main/$i" ];then
+	if [ -f "../../../i586/$MEDIAMAIN/$i" ];then
 		echo $i
 		echo "erase package $i"
 		rm -vf $i
 		echo "link with the i586 one"
-		ln -sf ../../../i586/media/main/$i .
+		ln -sf ../../../i586/$MEDIAMAIN/$i .
 	else
-		echo "no ../../../i586/media/main/$i package"
+		echo "no ../../../i586/$MEDIAMAIN/$i package"
 	fi
 done
 
-cat >> $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/i586/isolinux/isolinux.cfg <<EOF
+cat >> $BUILDPATH/i586/isolinux/isolinux.cfg <<EOF
 label harddisk64
   localboot 0x80
 label linux64
@@ -79,29 +94,26 @@ EOF
 
 #cp -avf $HOME/bcd/compssUsers.pl $HOME/build_bcd/build/mandriva-linux-free-dual-$TAG-$VERSION/i586/media/media_info/compssUsers.pl
 #cp -avf $HOME/bcd/compssUsers.pl $HOME/build_bcd/build/mandriva-linux-free-dual-$TAG-$VERSION/x86_64/media/media_info/compssUsers.pl
-cat $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-i586/i586/pkg-$VERSION-$TAG.idx >>  \
- $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx
-cat $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64/pkg-$VERSION-$TAG.idx >>  \
- $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx
-
+cat $BUILDPATH-i586/i586/pkg-$VERSION-$TAG.idx >> $BUILDPATH/$DISTRIB-$VERSION-dual.idx
+cat $BUILDPATH-x86_64/x86_64/pkg-$VERSION-$TAG.idx >> $BUILDPATH/$DISTRIB-$VERSION-dual.idx
 
 genisoimage -f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-load-size 4  \
-	-A 'Mandriva Linux - 2010 Spring (Free)' \
-	-publisher 'Mandriva' \
-	-sysid 'Mandriva Linux' \
-	-p 'Mandriva-Linux BCD' \
-	-volset 'Mandriva Linux - 2010 Spring (Free) - DUAL CD' \
-	-V 'FREE-2010S-DUAL' \
-	-o '/home/plop/build_bcd/iso/mandriva-linux-free-dual-2010-spring/mandriva-linux-free-2010-spring-dual.iso' \
+	-A "$AGENISO"
+	-publisher "$PUBLISHER" \
+	-sysid "$SYSID" \
+	-p "$TOOL" \
+	-volset "$VOLSET" \
+	-V "$VOLUME" \
+	-o "$BUILDPATH/$DISTRIB-dual.iso" \
 	-b i586/isolinux/isolinux.bin \
 	-boot-info-table \
 	-quiet \
-	$HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/
-
-du -sh $HOME/build_bcd/iso/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.iso
-echo "$HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx"
-cd $HOME/build_bcd/iso/mandriva-linux-free-dual-$VERSION/
-isohybrid -fatfirst $HOME/build_bcd/iso/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.iso
-cp $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx .
-md5sum mandriva-linux-free-$VERSION-dual.iso > mandriva-linux-free-$VERSION-dual.iso.md5
-sha1sum mandriva-linux-free-$VERSION-dual.iso > mandriva-linux-free-$VERSION-dual.iso.sha1
+	$BUILDPATH/
+
+du -sh $BUILDPATH/$DISTRIB-$VERSION-dual.iso
+echo "$BUILDPATH/$DISTRIB-$VERSION-dual.idx"
+cd $BUILDPATH/
+isohybrid -fatfirst $BUILDPATH/$DISTRIB-$VERSION-dual.iso
+cp $BUILDPATH/$DISTRIB-$VERSION-dual.idx .
+md5sum $DISTRIB-$VERSION-dual.iso > $DISTRIB-$VERSION-dual.iso.md5
+sha1sum $DISTRIB-$VERSION-dual.iso > $DISTRIB-$VERSION-dual.iso.sha1