--- trunk/www/working/scripts/create-iso-tree	2010/08/16 13:00:26	99
+++ trunk/www/working/scripts/create-iso-tree	2010/09/15 12:51:06	110
@@ -15,6 +15,11 @@
     TGZ_DIR=/home/spiros/clonezilla-sysresccd/trunk/create-clonezilla-sysresccd
 fi
 
+
+unset VERSION
+VERSION=`sed '2!d' ../release-data`
+
+
 # clean output folder
 rm -rf /root/tmp/clonezilla-sysresccd/clonezilla*.iso 2>/dev/null
 for n in 0 1 2;do
@@ -25,7 +30,6 @@
 clear
 
 
-unset VERSION
 for ISO in  `find /root/tmp/ -name "clonezilla-sysresccd*.iso"`;do
     FILE=`basename ${ISO}`
     ISO_DIR=`echo "$FILE" | sed 's|.iso$||'`
@@ -69,11 +73,22 @@
 done
 
 # create tgz file
+echo "
+
+
+VERSION=$VERSION
+
+Creating TARBALL...
+"
 cd "$TGZ_DIR"
+make clean
 make dist || {
-    echo "Error on make dist..."
+    echo "
+    
+    
+    Error on make dist..."
     exit 1
 } && {
-    rm "$OUT_DIR"/*z 2>/dev/null
-    cp "$TGZ_DIR"/create-clonezilla-sysresccd-"$VERSION".tar.gz "$OUT_DIR"
+    rm "$OUT_DIR"/clonezilla-sysresccd-"$VERSION"/*z 2>/dev/null
+    cp "$TGZ_DIR"/create-clonezilla-sysresccd-"$VERSION".tar.gz "$OUT_DIR"/clonezilla-sysresccd-"$VERSION"
 }