réorg

methode/hashes/robot.sh

@@ -1,40 +1,32 @@
 #!/bin/bash
-flag=$TMP_PATH/hashes_bot.flag
+METHODE=hashes
+flag=$TMP_PATH/${METHODE}_bot.flag
 date=`date +%Y%m%d0000`
 
 if [ -f $flag ];
 then
-  echo "hashes_bot is already running !"
+  echo "${METHODE}_bot is already running !"
   exit 0
 fi
 touch $flag
 
-cd $APPS_PATH/methode/hashes
+cd $APPS_PATH/methode/$METHODE
 for BLOCK in `grep LAST $DATA_PATH/block_list.txt | awk '{print $2}'`
 do
-  if [ ! -f $DATA_PATH/hashes/$BLOCK.png ]
+  if [ ! -f $DATA_PATH/$METHODE/$BLOCK.png ]
   then
     BLOCK_HEIGHT=`grep $BLOCK $DATA_PATH/block_list.txt | awk '{print $3}'`
     php robot.php $BLOCK $((RANDOM % 6))
+
     echo $BLOCK_HEIGHT $BLOCK >> $DATA_PATH/hashes2hashes/liste.txt
-    mv $DATA_PATH/hashes2hashes/liste.txt $DATA_PATH/hashes2hashes/liste.new
-    sort -k1 -n $DATA_PATH/hashes2hashes/liste.new > $DATA_PATH/hashes2hashes/liste.txt
-    rm -f $DATA_PATH/hashes2hashes/liste.new
-    COMPTEUR=`wc -l $DATA_PATH/hashes2hashes/liste.txt | awk '{print $1}' `
-    if [ $COMPTEUR -eq 6 ]
-    then
-      php assemble.php
-      rm -f $DATA_PATH/hashes2hashes/liste.old
-      mv $DATA_PATH/hashes2hashes/liste.txt $DATA_PATH/hashes2hashes/liste.old
-    fi
   fi
 
   BNAME=`grep $BLOCK $DATA_PATH/block_list.txt | awk '{print $1}'`
   if [ "$BNAME" == "LAST" ]
   then
-    touch $DATA_PATH/hashes/$BLOCK.png
+    touch $DATA_PATH/$METHODE/$BLOCK.png
   else
-    touch -t $date $DATA_PATH/hashes/$BLOCK.png
+    touch -t $date $DATA_PATH/$METHODE/$BLOCK.png
   fi
 
 done