Auth fix, stats script sorted output, login tip change

This commit is contained in:
MrFry 2020-04-20 14:53:49 +02:00
parent 720e616e6a
commit ef9a60fd7f
4 changed files with 16 additions and 7 deletions

View file

@ -15,7 +15,7 @@ G=''
# YELLOW=''
B=''
P=''
C=''
C=''
sep="${P}--------------------------------------------------------------------------------<=$NC"
pcolumns () {
@ -63,18 +63,21 @@ pcolumns () {
function jsonStats () {
dateind=$(date '+%Y/%m/%d')
b=$(cat "$1" | jq ".[\"$dateind\"]" | grep -ve '^{' | grep -ve '}$' | grep -ve '^\s*}')
b=$(cat "$1" | jq ".[\"$dateind\"]" | grep -ve '^{' | grep -ve '}$' | grep -ve '^\s*}' | sort)
bc=$(cat "$1" | jq ".[\"$dateind\"] | length")
b="\t${bc}\n${b}"
dateind=$(date -d 'yesterday' '+%Y/%m/%d')
a=$(cat "$1" | jq ".[\"$dateind\"]" | grep -ve '^{' | grep -ve '}$' | grep -ve '^\s*}')
a=$(cat "$1" | jq ".[\"$dateind\"]" | grep -ve '^{' | grep -ve '}$' | grep -ve '^\s*}' | sort)
ac=$(cat "$1" | jq ".[\"$dateind\"] | length")
a="\t${ac}\n${a}"
pcolumns $"$a" $"$b" | sed -E \
-e "s,/getVeteranPw,${C}&${NC},g" \
-e "s,/getVeteranpw,${C}&${NC},g" \
-e "s,/getveteranpw,${C}&${NC},g" \
-e "s,/pwRequest,${C}&${NC},g" \
-e "s,/getpw,${C}&${NC},g" \
-e "s,/avaiblePWS,${C}&${NC},g" \
-e "s,/pwRequest,${C}&${NC},g" \
-e "s,/login,${C}&${NC},g" \
-e "s,/manual,${G}&${NC},g" \
@ -88,7 +91,6 @@ function jsonStats () {
-e "s,/allqr,${G}&${NC},g" \
-e "s,/legacy,${G}&${NC},g" \
-e "s,/donate,${P}&${NC},g" \
-e "s,/thanks,${P}&${NC},g" \
-e "s,/tiszai,${P}&${NC},g" \
-e "s,/install,${P}&${NC},g" \
-e "s,/irc,${P}&${NC},g" \
@ -97,6 +99,7 @@ function jsonStats () {
-e "s,/scriptgit,${P}&${NC},g" \
-e "s,/classesgit,${P}&${NC},g" \
-e "s,/lred,${R}&${NC},g" \
-e "s,/thanks,${R}&${NC},g" \
-e "s,/isAdding,${B}&${NC},g" \
-e "s,/ask,${B}&${NC},g"
}