From 9a041d95bd98c7ccee5e040927bdc9b38ce74918 Mon Sep 17 00:00:00 2001 From: Matias Barcenas Date: Sun, 13 Aug 2017 00:25:53 -0500 Subject: [PATCH] Rewrote target AP view to utilize FormatUtils. --- fluxion.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fluxion.sh b/fluxion.sh index e0f4f42..72dd045 100755 --- a/fluxion.sh +++ b/fluxion.sh @@ -72,7 +72,7 @@ function exitmode() { if [ ! $FLUXIONDebug ]; then fluxion_header - echo -e "\n\n$CWht[$CRed-$CWht]$CRed $FLUXIONCleanupAndClosingNotice$CClr" + echo -e "$CWht[$CRed-$CWht]$CRed $FLUXIONCleanupAndClosingNotice$CClr" local processes readarray processes < <(ps -A) @@ -778,11 +778,12 @@ function set_target_ap() { } function view_target_ap_info() { - - echo -e " "$CBlu" SSID"$CClr": $APTargetSSID / $APTargetEncryption" - echo -e " "$CBlu"Channel"$CClr": $APTargetChannel" - #echo -e " "$CBlu" Speed"$CClr": ${speed:2} Mbps" - echo -e " "$CBlu" BSSID"$CClr": $APTargetMAC ($CYel${APTargetMaker:-UNKNOWN}$CClr)" + format_autosize "%*s$CBlu%7s$CClr: %-32b%*s\n" + + printf "$FormatAutosize" "" "ESSID" "$APTargetSSID / $APTargetEncryption" "" + printf "$FormatAutosize" "" "Channel" "$APTargetChannel" "" + printf "$FormatAutosize" "" "BSSID" "$APTargetMAC ($CYel${APTargetMaker:-UNKNOWN}$CClr)" "" + echo }