diff --git a/shell/0.sms.command.sh b/shell/0.sms.command.sh index 383d1cc..a182c6d 100755 --- a/shell/0.sms.command.sh +++ b/shell/0.sms.command.sh @@ -16,9 +16,15 @@ # return false; #} #?> +MY_PATH="`dirname \"$0\"`" # relative +MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized [[ -f /tmp/sms.commands ]] && echo "" > /tmp/sms.commands tail -fn 1 /tmp/sms.commands | while read -r line do - [[ $line != "" ]] && mycmd="/home/pi/G1sms+/shell/sms_AUTH.sh $line" && echo "RUN: $mycmd" && eval "$mycmd" + if [[ $line != "" ]]; then + mycmd="$MY_PATH/sms_AUTH.sh $line" + echo "RUN: $mycmd" > /tmp/sms.commmand.result + eval "$mycmd" >> /tmp/sms.commmand.result + fi done diff --git a/shell/sms_AUTH.sh b/shell/sms_AUTH.sh index 5e0bb21..fd0a1a3 100755 --- a/shell/sms_AUTH.sh +++ b/shell/sms_AUTH.sh @@ -16,9 +16,11 @@ PHONE=$1 VALEUR=$2 TODAY=$(date '+%Y%m%d') log "__SUB:sms_AUTH.sh ($PHONE, $VALEUR)" -[[ $VALEUR == "" ]] && echo "Valeur totale des G1Billets?" && exit -[[ $PHONE != "" ]] && sms_INIT_ACCOUNT "$PHONE" "NOSMS" || exit -[[ $UNKNOWN == "unknown" ]] && echo "Envoyer N au $MASTERPHONE" && exit + +## INITIALIZE RESULT FILE +[[ $VALEUR == "" ]] && echo "Indiquez la valeur des G1Billets" && exit 1 +[[ $PHONE != "" ]] && sms_INIT_ACCOUNT "$PHONE" "NOSMS" || exit 1 +[[ $UNKNOWN == "unknown" ]] && echo "G1sms Wallet $PHONE inconnu! Envoyer N au $MASTERPHONE" && exit 1 # Get AMOUNTG1, AMOUNTLOVE, AMOUNTDU AMOUNTG1=$(./silkaj/silkaj amount "$PUBKEY") diff --git a/www/g1billet/test.php b/www/g1billet/test.php index 854ea74..e252348 100644 --- a/www/g1billet/test.php +++ b/www/g1billet/test.php @@ -1,5 +1,13 @@ + +
+
+
+ +
+ LOVE
+ +
diff --git a/www/g1billet/zen_sms.php b/www/g1billet/zen_sms.php index a7c0576..194d5cf 100644 --- a/www/g1billet/zen_sms.php +++ b/www/g1billet/zen_sms.php @@ -5,6 +5,9 @@ if (strlen($_REQUEST['num']) == 10 ) { $data = '"'.$newNumber.'" "'.$_REQUEST['val'].'"'.PHP_EOL; $fp = fopen('/tmp/sms.commands', 'a'); fwrite($fp, $data); + sleep(1); + echo exec('cat /tmp/sms.commmand.result'); + return true; } else { return false; }