X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=bin%2Fpreload.sh;h=dd7ce6b982d5a822b866f9fa23b87a3058847e89;hb=1f5795fd45dcccc42e794089d14350c6b5c5fecd;hp=57c95edadfa1ae529b19337e17188a47d896fde1;hpb=b43874693573e29cf25fbcd1fb8fc2d54ed9ea76;p=brisk.git

diff --git a/bin/preload.sh b/bin/preload.sh
index 57c95ed..dd7ce6b 100755
--- a/bin/preload.sh
+++ b/bin/preload.sh
@@ -30,6 +30,10 @@ IMGPATH=../brisk-img
 # echo '?>'
 # ) > $OUTFILE
 
+function imglist () {
+    ls -S `find $1 -type f -name '*.jpg' -o -name '*.png' -o -name '*.gif' | grep -v '/src_' | sort`
+}
+
 rm -f $OUTFILE
 
 (
@@ -37,13 +41,12 @@ echo "var g_preload_img_arr = new Array( "
 first=1
 spa="            "
 ltri="`echo "$IMGPATH" | wc -c`"
-for i in `find $IMGPATH -type f -name '*.jpg' -o -name '*.png' -o -name '*.gif' | grep -v '/src_' | sort`; do
+for i in `imglist $IMGPATH`; do
    if [ $first -ne 1 ]; then
       echo -n ", "
-      if [ $ct -eq 3 ]; then
+      if [ $((ct % 2)) -eq 0 ]; then
          echo
          echo -n "$spa"
-         ct=0
       fi
    else
       echo -n "$spa"
@@ -53,7 +56,7 @@ for i in `find $IMGPATH -type f -name '*.jpg' -o -name '*.png' -o -name '*.gif'
    ct=$((ct + 1))
    first=0
 done
-
+echo "CT: $ct" >&2
 echo ");"
 ) >> $OUTFILE
 
@@ -63,18 +66,17 @@ first=1
 sum=0
 spa="            "
 tot=0
-for i in `find $IMGPATH -type f -name '*.jpg' -o -name '*.png' -o -name '*.gif' | grep -v '/src_' | sort`; do
+for i in `imglist $IMGPATH`; do
    sz="`stat -c '%s' $IMGPATH/$i`"
    tot=$((tot + sz))
 done
 
-for i in `find $IMGPATH -type f -name '*.jpg' -o -name '*.png' -o -name '*.gif' | grep -v '/src_' | sort`; do
+for i in `imglist $IMGPATH`; do
    if [ $first -ne 1 ]; then
       echo -n ", "
-      if [ $ct -eq 8 ]; then
+      if [ $((ct % 8)) -eq 0 ]; then
          echo
          echo -n "$spa"
-         ct=0
       fi
    else
       echo -n "$spa"
@@ -87,6 +89,8 @@ for i in `find $IMGPATH -type f -name '*.jpg' -o -name '*.png' -o -name '*.gif'
    first=0
 done
 
+echo "CT2: $ct" >&2
+
 echo ");"
 ) >> $OUTFILE