Skip to content

Commit

Permalink
Merge pull request #106 from KnownAim/master
Browse files Browse the repository at this point in the history 
Multiple Issues Fixed. PLEASE SEE COMMENT!
  • Loading branch information
@jpmck
jpmck committed Jul 3, 2020
2 parents 4f3d72e + 4874717 commit ca6a2ab
Showing 1 changed file with 14 additions and 13 deletions.
27 changes: 14 additions & 13 deletions padd.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ mini_text_retro="${dim_text}${cyan_text}m${magenta_text}i${red_text}n${yellow_te
padd_logo_1="${bold_text}${green_text} __ __ __ ${reset_text}"
padd_logo_2="${bold_text}${green_text}|__) /\\ | \\| \\ ${reset_text}"
padd_logo_3="${bold_text}${green_text}| /--\\|__/|__/ ${reset_text}"
padd_logo_retro_1="${bold_text} ${yellow_text}_${green_text}_ ${blue_text}_ ${yellow_text}_${green_text}_ ${reset_text}"
padd_logo_retro_1="${bold_text} ${yellow_text}_${green_text}_ ${blue_text}_${magenta_text}_ ${yellow_text}_${green_text}_ ${reset_text}"
padd_logo_retro_2="${bold_text}${yellow_text}|${green_text}_${blue_text}_${cyan_text}) ${red_text}/${yellow_text}\\ ${blue_text}| ${red_text}\\${yellow_text}| ${cyan_text}\\ ${reset_text}"
padd_logo_retro_3="${bold_text}${green_text}| ${red_text}/${yellow_text}-${green_text}-${blue_text}\\${cyan_text}|${magenta_text}_${red_text}_${yellow_text}/${green_text}|${blue_text}_${cyan_text}_${magenta_text}/ ${reset_text}"

Expand Down Expand Up @@ -328,7 +328,7 @@ GetNetworkInformation() {
# if the DHCP Router variable isn't set
# Issue 3: https://github.com/jpmck/PADD/issues/3
if [ -z ${DHCP_ROUTER+x} ]; then
DHCP_ROUTER=$(/sbin/ip route | awk '/default/ { print $3 }')
DHCP_ROUTER=$(/sbin/ip route | awk '/default/ { printf "%s\t", $3 }')
fi

dhcp_info=" Router: ${DHCP_ROUTER}"
Expand Down Expand Up @@ -567,7 +567,7 @@ ceol=$(tput el)

# wrapper - echo with a clear eol afterwards to wipe any artifacts remaining from last print
CleanEcho() {
echo -e $1 "${ceol}"
echo -e "${ceol}$1"
}

# wrapper - printf
Expand Down Expand Up @@ -633,7 +633,7 @@ PrintNetworkInformation() {
CleanPrintf " %-9s${dhcp_heatmap}%-10s${reset_text} %-9s${dhcp_ipv6_heatmap}%-10s${reset_text}\e[0K\\n" "DHCP:" "${dhcp_status}" "IPv6:" ${dhcp_ipv6_status}
fi
elif [[ "$1" = "regular" || "$1" = "slim" ]]; then
CleanEcho "${bold_text}NETWORK ====================================================${reset_text}"
CleanEcho "${bold_text}NETWORK ===================================================${reset_text}"
CleanPrintf " %-10s%-19s %-10s%-19s\e[0K\\n" "Hostname:" "${full_hostname}" "IPv4:" "${IPV4_ADDRESS}"
CleanPrintf " %-10s%-19s\e[0K\\n" "IPv6:" "${IPV6_ADDRESS}"
CleanPrintf " %-10s%-19s %-10s%-19s\e[0K\\n" "DNS:" "${dns_information}" "DNSSEC:" "${dnssec_heatmap}${dnssec_status}${reset_text}"
Expand All @@ -643,14 +643,14 @@ PrintNetworkInformation() {
CleanPrintf "%s\e[0K\\n" "${dhcp_info}"
fi
else
CleanEcho "${bold_text}NETWORK ========================================================================${reset_text}"
CleanEcho "${bold_text}NETWORK =======================================================================${reset_text}"
CleanPrintf " %-10s%-19s\e[0K\\n" "Hostname:" "${full_hostname}"
CleanPrintf " %-10s%-19s %-10s%-29s\e[0K\\n" "IPv4 Adr:" "${IPV4_ADDRESS}" "IPv6 Adr:" "${IPV6_ADDRESS}"
CleanEcho "DNS ============================================================================"
CleanEcho "DNS ==========================================================================="
CleanPrintf " %-10s%-39s\e[0K\\n" "Servers:" "${dns_information}"
CleanPrintf " %-10s${dnssec_heatmap}%-19s${reset_text} %-20s${conditional_forwarding_heatmap}%-9s${reset_text}\e[0K\\n" "DNSSEC:" "${dnssec_status}" "Conditional Fwding:" "${conditional_forwarding_status}"

CleanEcho "DHCP ==========================================================================="
CleanEcho "DHCP =========================================================================="
CleanPrintf " %-10s${dhcp_heatmap}%-19s${reset_text} %-10s${dhcp_ipv6_heatmap}%-9s${reset_text}\e[0K\\n" "DHCP:" "${dhcp_status}" "IPv6 Spt:" "${dhcp_ipv6_status}"
CleanPrintf "%s\e[0K\\n" "${dhcp_info}"
fi
Expand All @@ -670,7 +670,7 @@ PrintPiholeInformation() {
CleanEcho "${bold_text}PI-HOLE ================================${reset_text}"
CleanPrintf " %-9s${pihole_heatmap}%-10s${reset_text} %-9s${ftl_heatmap}%-10s${reset_text}\e[0K\\n" "Status:" "${pihole_status}" "FTL:" "${ftl_status}"
elif [[ "$1" = "regular" || "$1" = "slim" ]]; then
CleanEcho "${bold_text}PI-HOLE ====================================================${reset_text}"
CleanEcho "${bold_text}PI-HOLE ===================================================${reset_text}"
CleanPrintf " %-10s${pihole_heatmap}%-19s${reset_text} %-10s${ftl_heatmap}%-19s${reset_text}\e[0K\\n" "Status:" "${pihole_status}" "FTL:" "${ftl_status}"
else
return
Expand Down Expand Up @@ -701,7 +701,7 @@ PrintPiholeStats() {
CleanPrintf " %-9s%-29s\\n" "Top Ad:" "${top_blocked}"
fi
elif [[ "$1" = "regular" || "$1" = "slim" ]]; then
CleanEcho "${bold_text}STATS ======================================================${reset_text}"
CleanEcho "${bold_text}STATS =====================================================${reset_text}"
CleanPrintf " %-10s%-49s\e[0K\\n" "Blocking:" "${domains_being_blocked} domains"
CleanPrintf " %-10s[%-40s] %-5s\e[0K\\n" "Pi-holed:" "${ads_blocked_bar}" "${ads_percentage_today}%"
CleanPrintf " %-10s%-49s\e[0K\\n" "Pi-holed:" "${ads_blocked_today} out of ${dns_queries_today} queries"
Expand All @@ -712,14 +712,14 @@ PrintPiholeStats() {
CleanPrintf " %-10s%-39s\e[0K\\n" "Top Clnt:" "${top_client}"
fi
else
CleanEcho "${bold_text}STATS ==========================================================================${reset_text}"
CleanEcho "${bold_text}STATS =========================================================================${reset_text}"
CleanPrintf " %-10s%-19s %-10s[%-40s] %-5s\e[0K\\n" "Blocking:" "${domains_being_blocked} domains" "Piholed:" "${ads_blocked_bar}" "${ads_percentage_today}%"
CleanPrintf " %-10s%-30s%-29s\e[0K\\n" "Clients:" "${clients}" " ${ads_blocked_today} out of ${dns_queries_today} queries"
CleanPrintf " %-10s%-39s\e[0K\\n" "Latest:" "${latest_blocked}"
CleanPrintf " %-10s%-39s\e[0K\\n" "Top Ad:" "${top_blocked}"
CleanPrintf " %-10s%-39s\e[0K\\n" "Top Dmn:" "${top_domain}"
CleanPrintf " %-10s%-39s\e[0K\\n" "Top Clnt:" "${top_client}"
CleanEcho "FTL ============================================================================"
CleanEcho "FTL ==========================================================================="
CleanPrintf " %-10s%-9s %-10s%-9s %-10s%-9s\e[0K\\n" "PID:" "${ftlPID}" "CPU Use:" "${ftl_cpu}%" "Mem. Use:" "${ftl_mem_percentage}%"
CleanPrintf " %-10s%-69s\e[0K\\n" "DNSCache:" "${cache_inserts} insertions, ${cache_deletes} deletions, ${cache_size} total entries"
fi
Expand All @@ -745,7 +745,7 @@ PrintSystemInformation() {
echo -ne "${ceol}Memory: [${memory_heatmap}${memory_bar}${reset_text}] ${memory_percent}%"
# else we're not
elif [[ "$1" = "regular" || "$1" = "slim" ]]; then
CleanEcho "${bold_text}SYSTEM =====================================================${reset_text}"
CleanEcho "${bold_text}SYSTEM ====================================================${reset_text}"
# Uptime
CleanPrintf " %-10s%-39s\e[0K\\n" "Uptime:" "${system_uptime}"

Expand All @@ -756,7 +756,7 @@ PrintSystemInformation() {
# Memory and CPU bar
CleanPrintf " %-10s[${memory_heatmap}%-10s${reset_text}] %-6s %-10s[${cpu_load_1_heatmap}%-10s${reset_text}] %-5s" "Memory:" "${memory_bar}" "${memory_percent}%" "CPU Load:" "${cpu_bar}" "${cpu_percent}%"
else
CleanEcho "${bold_text}SYSTEM =========================================================================${reset_text}"
CleanEcho "${bold_text}SYSTEM ========================================================================${reset_text}"
# Uptime and memory
CleanPrintf " %-10s%-39s %-10s[${memory_heatmap}%-10s${reset_text}] %-6s\\n" "Uptime:" "${system_uptime}" "Memory:" "${memory_bar}" "${memory_percent}%"

Expand Down Expand Up @@ -857,6 +857,7 @@ SizeChecker(){
else
padd_size="mega"
fi
padd_size="mega"
}

CheckConnectivity() {
Expand Down

0 comments on commit ca6a2ab

Please sign in to comment.