--- trunk/www/working/scripts/2site	2010/05/18 14:22:00	42
+++ trunk/www/working/scripts/2site	2010/05/19 15:03:43	45
@@ -19,27 +19,33 @@
 # along with Clonezilla-SysRescCD. If not, see <http://www.gnu.org/licenses/>.
 #
 ####################################################################################
-cd ..
-cd ..
-echo 'Creating files'
-echo -n "  template.html...   "
-myDate=`sed -n '1p' working/release-data `
-myVersion=`sed -n '2p' working/release-data `
-thisDate=`date '+%d/%m/%Y'`
 
 
+####################################################################################
+# Configuration section
+#
+# 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
 
-# . "$HOME/.2site.conf"
-[ -e "$whereIsTheISO" ] && isoSize=$(du -h "$whereIsTheISO" | sed "s|/.*||" |sed 's|\([kMG]\).*| \1|') || {
-  echo "    Error: The variable \"whereIsTheISO\" is invalid
-                   Please edit your ~/.2site.conf file"
-#   exit 1
-}
+####################################################################################
+
 
+####################################################################################
+#                             Script starts here                                   #
+####################################################################################
+
+# Go to www/ directory
+cd ..
+cd ..
+echo 'Creating files'
+echo -n "  template.html...   "
+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")"
 
@@ -82,7 +88,7 @@
 
 sed "/<H1[^>]*>What's New<.H1>/a \
 $l
-" .template.html | sed "s|\"myDate\"|$myDate|" | sed "s|\"myVersion\"|$myVersion|g" | sed "s|Last update: [^<]*<|Last update: $thisDate<|" > template.html
+" working/.template.html | sed "s|\"myDate\"|$myDate|" | sed "s|\"myVersion\"|$myVersion|g" | sed "s|Last update: [^<]*<|Last update: $thisDate<|" > template.html
 
 
 echo 'done'
@@ -95,7 +101,7 @@
 
 echo -n '  news.php...   '
 sed -n '1,/<div id="content">/p' template.html > 1.$$
-cat .news.php >> 1.$$
+cat working/.news.php >> 1.$$
 sed '1,/<div id="content">/d' template.html | sed '/<div id="menu">/,/<.div>/d'  >> 1.$$
 
 sed '/#content/s/width: 750px;/width: 950px/' 1.$$ | sed "s|background-image: url('images/line.png'); background-repeat:repeat-y;||
@@ -123,12 +129,12 @@
 rm 1.$$
 
 sed -n '1,/<.[hH][eE][aA][dD]>/p' xxx.html | sed '$d' > p1.$$
-sed -n '1,/<!--seperator-->/p' .404.html >> p1.$$
+sed -n '1,/<!--seperator-->/p' working/.404.html >> p1.$$
 sed -n '/<.[hH][eE][aA][dD]>/,$p' xxx.html >> p1.$$
 mv p1.$$ xxx.html
 
 sed -n '1,/<[dD][iI][vV] [iI][dD]="content">/p' xxx.html> p1.$$
-sed '1,/<!--seperator-->/d' .404.html >> p1.$$
+sed '1,/<!--seperator-->/d' working/.404.html >> p1.$$
 sed -n '/<[dD][iI][vV] [iI][dD]="content">/,$p' xxx.html | sed '1d'  >> p1.$$
 sed '/<!--seperator-->/d' p1.$$ > 404.html
 rm *.$$ xxx.html