X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=home%2Flib%2Flogin_functions.sh;h=59989aff618e52ca9ca52afa24c3d1024d852ce3;hb=b7f9c894dbdbf584abba590d48c2f84fcb8adc8f;hp=426cbb29d32dcd84ab37efc7762f91da66ecdf5a;hpb=b635bb83baeb50114b3f5966a41fa67d83abb61b;p=khome.git diff --git a/home/lib/login_functions.sh b/home/lib/login_functions.sh index 426cbb2..59989af 100644 --- a/home/lib/login_functions.sh +++ b/home/lib/login_functions.sh @@ -256,7 +256,7 @@ _yt() { local -r opts="$3" local -r id=$(youtube-dlc --get-id "$uri") - local -r title=$(youtube-dlc --get-title "$uri" | sed 's/[^A-Za-z0-9._-]/_/g') + local -r title=$(youtube-dlc --get-title "$uri" | sed 's/[^А-Яа-яA-Za-z0-9._-]/_/g') local -r dir="${base_dir}/${title}--${id}" mkdir -p "$dir" @@ -536,13 +536,11 @@ status() { echo printf '%smem by proc\n' "$indent_unit" - ps -eo rss,cmd \ + ps -eo rss,comm \ | awk -v total="$(free | awk '$1 == "Mem:" {print $2; exit}')" ' NR > 1 { rss = $1 - cmd = $2 - n = split(cmd, path, "/") # _may_ be a path - proc = path[n] + proc = $2 by_proc[proc] += rss } @@ -667,10 +665,10 @@ status() { echo "${indent_unit}<->" - printf '%sTCP: ' "${indent_unit}${indent_unit}" + printf '%sTCP\t' "${indent_unit}${indent_unit}" sudo -n netstat -tnp \ | awk 'NR > 2 && $6 == "ESTABLISHED" {print $7}' \ - | awk -F/ '{print $2}' \ + | awk '{sub("^[0-9]+/", ""); print}' \ | sort -u \ | xargs \ | column -t @@ -730,7 +728,7 @@ ssh_invalid_by_day() { ' \ /var/log/auth.log \ /var/log/auth.log.1 \ - | sort -n -k 1 \ + | sort -k 3 \ | bar_gauge -v width="$(stty size | awk '{print $2}')" -v num=1 -v ch_right=' ' -v ch_left=' ' -v ch_blank=' ' \ | column -t }