diff --git a/API/QRCODE.sh b/API/QRCODE.sh index dcff1def..806886ea 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -47,14 +47,15 @@ if [[ ${QRCODE} == "station" ]]; then sed -i "s~http://127.0.0.1:8080~${myIPFS}~g" ~/.zen/tmp/${MOATS}/index.htm WSTATION="/ipfs/$(ipfs add -q ~/.zen/tmp/${MOATS}/index.htm)" - echo "NEW WSTATION ${myIPFS}${WSTATION}" echo $WSTATION > ~/.zen/tmp/WSTATION - + end=`date +%s` + echo "NEW WSTATION ${myIPFS}${WSTATION} Execution time was "`expr $end - $start` seconds. ## SEND TO WSTATION PAGE sed "s~_TWLINK_~${myIPFS}${WSTATION}/~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect echo "url='"${myIPFS}${WSTATION}"'" >> ~/.zen/tmp/${MOATS}/index.redirect ( cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 + echo "BLURP $PORT" && rm -Rf ~/.zen/tmp/${MOATS} ) & exit 0 fi @@ -73,7 +74,7 @@ if [[ ${QRCODE:0:2} == "G1" && ${AND} == "tw" ]]; then echo "url='"${LINK}"'" >> ~/.zen/tmp/${MOATS}/index.redirect ( cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 - rm -Rf ~/.zen/tmp/${MOATS} + echo "BLURP $PORT" && rm -Rf ~/.zen/tmp/${MOATS} ) & exit 0 fi @@ -95,7 +96,7 @@ if [[ $ASTROPATH != "" && $APPNAME == "" ]]; then echo "url='"${myG1BILLET}"?montant=0\&style=jeu'" >> ~/.zen/tmp/${MOATS}/index.redirect ( cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 - rm -Rf ~/.zen/tmp/${MOATS} + echo "BLURP $PORT" && rm -Rf ~/.zen/tmp/${MOATS} ) & exit 0 diff --git a/tools/make_image_ipfs_index_carousel.sh b/tools/make_image_ipfs_index_carousel.sh index 33d7e03b..eb3f38a4 100755 --- a/tools/make_image_ipfs_index_carousel.sh +++ b/tools/make_image_ipfs_index_carousel.sh @@ -128,8 +128,8 @@ if [[ $i =~ \.(JPG|jpg|PNG|png|JPEG|jpeg|GIF|gif)$ ]]; then MORE="${i%.png}.insert" echo "$MORE" - BUTTON="${i%.png}.button" - echo "$BUTTON" + CODEBOUTON="$(cat ${i%.png}.button)" + echo "$CODEBOUTON" LINK="\"$img_alt\"" [[ -s $MORE ]] && ZLINK=$(cat $MORE | sed "s~_REPLACE_~$LINK~g") || ZLINK="$LINK" @@ -137,14 +137,16 @@ if [[ $i =~ \.(JPG|jpg|PNG|png|JPEG|jpeg|GIF|gif)$ ]]; then if [ $num -eq 1 ]; then echo "
+ $CODEBOUTON +
$ZLINK -
$BUTTON
" >> $core_file else echo "
+ $CODEBOUTON +
$ZLINK -
$BUTTON -
" >> $core_file + " >> $core_file fi num=$((num+1)) fi diff --git a/www/PasseportTerre/index.html b/www/PasseportTerre/index.html index 09a013b6..e23becfb 100644 --- a/www/PasseportTerre/index.html +++ b/www/PasseportTerre/index.html @@ -104,7 +104,7 @@ - Entrez par le Le Claude + Revenez dans Le Claude

Astroport Ŋ1