This commit is contained in:
+2
-13
@@ -352,25 +352,14 @@ $RAW_V6"
|
|||||||
echo "$COUNTRY_STATS" | head -n 9 | while read -r count code; do
|
echo "$COUNTRY_STATS" | head -n 9 | while read -r count code; do
|
||||||
[ -n "$count" ] && [ -n "$code" ] && {
|
[ -n "$count" ] && [ -n "$code" ] && {
|
||||||
COUNTRY_NAME=$(get_country_name "$code")
|
COUNTRY_NAME=$(get_country_name "$code")
|
||||||
NAME_BYTE=$(printf "%s" "$COUNTRY_NAME" | wc -c)
|
printf " - %s %b(%s 个)%b\n" "$COUNTRY_NAME" "$C_RED" "$count" "$C_RESET"
|
||||||
NAME_CHAR=${#COUNTRY_NAME}
|
|
||||||
DISPLAY_W=$((NAME_BYTE - NAME_CHAR + NAME_CHAR))
|
|
||||||
PAD=$((24 - DISPLAY_W))
|
|
||||||
[ "$PAD" -lt 1 ] && PAD=1
|
|
||||||
printf " - %s%*s%b(%s 个)%b\n" "$COUNTRY_NAME" "$PAD" "" "$C_RED" "$count" "$C_RESET"
|
|
||||||
}
|
}
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ "$TOTAL_COUNTRIES" -gt 9 ]; then
|
if [ "$TOTAL_COUNTRIES" -gt 9 ]; then
|
||||||
REMAIN_COUNTRIES=$((TOTAL_COUNTRIES - 9))
|
REMAIN_COUNTRIES=$((TOTAL_COUNTRIES - 9))
|
||||||
REMAIN_COUNT=$(echo "$COUNTRY_STATS" | tail -n +10 | awk '{sum+=$1} END {print sum}')
|
REMAIN_COUNT=$(echo "$COUNTRY_STATS" | tail -n +10 | awk '{sum+=$1} END {print sum}')
|
||||||
REMAIN_TEXT="其他 $REMAIN_COUNTRIES 个国家"
|
printf " - 其他 %s 个国家 %b(%s 个)%b\n" "$REMAIN_COUNTRIES" "$C_RED" "$REMAIN_COUNT" "$C_RESET"
|
||||||
TEXT_BYTE=$(printf "%s" "$REMAIN_TEXT" | wc -c)
|
|
||||||
TEXT_CHAR=${#REMAIN_TEXT}
|
|
||||||
DISPLAY_W=$((TEXT_BYTE - TEXT_CHAR + TEXT_CHAR))
|
|
||||||
PAD=$((24 - DISPLAY_W))
|
|
||||||
[ "$PAD" -lt 1 ] && PAD=1
|
|
||||||
printf " - %s%*s%b(%s 个)%b\n" "$REMAIN_TEXT" "$PAD" "" "$C_RED" "$REMAIN_COUNT" "$C_RESET"
|
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "(暂无国家信息)"
|
echo "(暂无国家信息)"
|
||||||
|
|||||||
Reference in New Issue
Block a user