--- trunk/www/working/scripts/2site	2010/05/20 15:43:26	49
+++ trunk/www/working/scripts/2site	2010/08/16 13:00:26	99
@@ -26,10 +26,7 @@
 #
 # Set whereIsTheISO to the location of current Clonezilla-SysRescCD ISO file
 # Set whereIsTheTarBall to the location of current Clonezilla-SysRescCD TGZ file
-whereIsTheISO=/e/clonezilla-sysresccd-full-mod-"$myVersion"/clonezilla-sysresccd-full-mod-"$myVersion".iso
-whereIsTheISO=/e/clonezilla-sysresccd-full-mod-"$myVersion".iso
-
-whereIsTheTarBall=/home/spiros/multibootcd/create-clonezilla-sysresccd-"$myVersion".tar.gz
+whereIsTheISO=/e/clonezilla-sysresccd-"$myVersion"
 
 ##############################################################################
 #                             Script starts here                             #
@@ -43,8 +40,15 @@
 myDate=`sed -n '1p' working/release-data `
 myVersion=`sed -n '2p' working/release-data `
 thisDate=`date '+%d/%m/%Y'`
-md5sum="$(echo "$whereIsTheISO" | sed 's|/[^/]*$|/md5sum.txt|')"
-md5sum="$(cat "$md5sum")"
+
+whereIsTheISO="$whereIsTheISO""$myVersion"
+whereIsTheTarBall="$whereIsTheISO"/create-clonezilla-sysresccd-"$myVersion".tar.gz
+ISO_I686_SIZE=`du -h "$whereIsTheISO"/clonezilla-sysresccd-i686-"$myVersion"/clonezilla-sysresccd-i686-"$myVersion".iso | sed 's|[ \t].*||'`
+ISO_I686_MD5=`cat "$whereIsTheISO"/clonezilla-sysresccd-i686-"$myVersion"/md5sum.txt | sed 's|[ \t].*||'`
+ISO_AMD64_SIZE=`du -h "$whereIsTheISO"/clonezilla-sysresccd-amd64-"$myVersion"/clonezilla-sysresccd-amd64-"$myVersion".iso | sed 's|[ \t].*||'`
+ISO_AMD64_MD5=`cat "$whereIsTheISO"/clonezilla-sysresccd-amd64-"$myVersion"/md5sum.txt | sed 's|[ \t].*||'`
+ISO_I486_SIZE=`du -h "$whereIsTheISO"/clonezilla-sysresccd-i486-"$myVersion"/clonezilla-sysresccd-i486-"$myVersion".iso | sed 's|[ \t].*||'`
+ISO_I486_MD5=`cat "$whereIsTheISO"/clonezilla-sysresccd-i486-"$myVersion"/md5sum.txt | sed 's|[ \t].*||'`
 
 tarballSize=$(du -h "$whereIsTheTarBall" | sed "s|/.*||" |sed 's|\([kMG]\).*| \1|')
 isoSizeEN=$(echo "$isoSize" | sed 's|,|.|')
@@ -54,7 +58,6 @@
 
 
 
-
 tr -d '\n' < working/clonezilla-sysresccd.rss | sed 's|<[tT][iI][tT][lL][eE]>|\n<title>|g' | sed 's|</[pP][uU][bB][Dd][aA][tT][eE]>|</pubDate>\n|g' | grep '<title>' > /tmp/iaa.$$
 
 rm /tmp/aai.$$ 2>/dev/null
@@ -192,8 +195,14 @@
 s/<!--txt-only-->.*<!--end-txt-only-->//' tpm.$$ | sed 's| $||'  | sed "s|\"myTitle\"|$myTitle|
 s|\"myVersion\"|$myVersion|g
 s|TARBALL_SIZE|$tarballSizeEN|g
-s|ISO_SIZE|$isoSizeEN|g
-s|\"MD5SUM\"|$md5sum|
+
+s{ISO_I686_SIZE{$ISO_I686_SIZE{g
+s{ISO_I686_MD5{$ISO_I686_MD5{g
+s{ISO_I486_SIZE{$ISO_I486_SIZE{g
+s{ISO_I486_MD5{$ISO_I486_MD5{g
+s{ISO_AMD64_SIZE{$ISO_AMD64_SIZE{g
+s{ISO_AMD64_MD5{$ISO_AMD64_MD5{g
+
 /<[hH]1>.*<[bB][rR]/d
 s|class=\"here\" ||
 s|<a href=\"$fonly\">|<a class=\"here\" href=\"$fonly\">|