diff --git a/maple b/maple index fef0f74..5f456dd 100755 --- a/maple +++ b/maple @@ -55,7 +55,7 @@ echo -e '\033[0;34m'" ...... ......... .............. ##################################################################################################################### i=`cat maple|grep -n MARKER|cut -f1 -d":"`;i=$(echo $i|xargs|cut -f2 -d" ");ii=`wc -l maple|cut -f1 -d" "`; -iii=$((ii-i));tail -n $iii $0>mpl;MD5=$(md5sum mpl|cut -f1 -d ' ');rm mpl;DM5="9611774e2f284ff47399c3a58b5d4bb7"; +iii=$((ii-i));tail -n $iii $0>mpl;MD5=$(md5sum mpl|cut -f1 -d ' ');rm mpl;DM5="13c65cfe11675fa0a8c55d213403db13"; [ "$MD5" = "$DM5" ] || exit; # MARKER ############################################################################################################ @@ -326,8 +326,8 @@ kmode () { HYDRA="hydra_dupe__devops" fi; #[ "$MODE" = "0" ] [ -e storage/bot/status ] || (mkdir storage/bot/status) - echo "`cat storage/bot/status/status_id`" > storage/bot/status/status_id - kmodesetup "`cat storage/bot/status/status_id`" "$MODE" + echo "$HYDRA" > storage/bot/status/status_id + kmodesetup "$HYDRA" "$MODE" } ##################################################################################################################### @@ -504,14 +504,19 @@ cmd_hydra_dak () { analyze dak_tcp.tmp mv dak_tcp.tmp dak_tcp [ -e storage/user/logs ] || (mkdir storage/user/logs) - TCPAC=$(cat dak_tcp|nc tcp.ac 9999|jq -r '.txt,.del'|xargs); echo $TCPAC>storage/user/logs/tcpac.log - TXT=$(echo $TCPAC|cut -f 1 -d ' '); DEL=$(echo $TCPAC|cut -f 2 -d ' '); - echo -e "\n*** WRITE DOWN THIS TOKEN ***" - [ -e storage/user/logs ] || (mkdir storage/user/logs) - basename "$TXT">storage/user/logs/token.log - TOKEN=$(cat storage/user/logs/token.log) - echo -e "TOKEN: $TOKEN" - echo -e "*** WRITE DOWN THIS TOKEN ***" + TCPAC=$(cat dak_tcp|nc tcp.ac 9999|jq -r '.txt,.del > /dev/null 2>&1'|xargs); + if [ ! -z "$TCPAC" ]; then + echo $TCPAC>storage/user/logs/tcpac.log + TXT=$(echo $TCPAC|cut -f 1 -d ' '); DEL=$(echo $TCPAC|cut -f 2 -d ' '); + echo -e "\n*** WRITE DOWN THIS TOKEN ***" + [ -e storage/user/logs ] || (mkdir storage/user/logs) + basename "$TXT">storage/user/logs/token.log + TOKEN=$(cat storage/user/logs/token.log) + echo -e "TOKEN: $TOKEN" + echo -e "*** WRITE DOWN THIS TOKEN ***" + else + echo -e "TCP.AC SERVICE OUTAGE // YOU WILL HAVE TO MOVE CREDENTIALS MANUALLY" + fi } ##################################################################################################################### @@ -523,6 +528,10 @@ cmd_hydra_undak () { else token=$TOKEN fi + if [ -z "$TOKEN ] then; + echo -e "TOKEN OMITTED - BYPASSING CREDENTIAL AUTOMATION - YOU WILL HAVE TO SETUP CREDENTIALS MANUALLY" + return + fi curl -L "https://tcp.ac/t/$token" --output dak_tcp mkdir -p storage/user/config cp storage/user/scripts/unkey.py .