Skip to content

fix: #808 Fixed memory calculation error when free alias,Fix the erro… #812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
witt-bit wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: #808 Fixed memory calculation error when free alias,Fix the erro… #812

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions screenfetch-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,16 @@ if ! command -v "${AWK}" > /dev/null; then
exit 1
fi

# In zsh, free will be aliased as 'free -m', so you need to use the original free command (unless already specified in environment)
if [[ -z "${FREE}" ]]; then
FREE=$(type -a free | grep -v 'alias' | grep -m 1 '^free' | "${AWK}" '{print $3}')
fi

if ! command -v "${FREE}" > /dev/null; then
errorOut "No free interpreter available (FREE=\"${FREE}\")."
exit 1
fi

# Parse the rest of the flags (some of these functions require awk)
while getopts ":hsu:evVEnLNtlS:A:D:o:c:d:pa:w:C:" flags; do
case $flags in
Expand Down Expand Up @@ -658,7 +668,7 @@ detectdistro () {
distro_release=$("${AWK}" -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release)
elif grep -q -i 'Quirinux' /etc/os-release ; then
distro='Quirinux'
distro_release=$("${AWK}" -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release)
distro_release=$("${AWK}" -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release)
else
distro="Debian"
fi
Expand Down Expand Up @@ -1888,7 +1898,9 @@ detectmem () {
#done
#usedmem=$((usedmem / 1024))
#totalmem=$((totalmem / 1024))
mem=$(free -b | "${AWK}" -F ':' 'NR==2{print $2}' | "${AWK}" '{print $1"-"$6}')

# In the Chinese language environment, free -b will use Chinese symbols：
mem=$("${FREE}" -b | "${AWK}" -F ':|：' 'NR==2{print $2}' | "${AWK}" '{print $1"-"$6}')
usedmem=$((mem / 1024 / 1024))
totalmem=$((${mem//-*} / 1024 / 1024))
fi
Expand Down Expand Up @@ -3492,7 +3504,7 @@ asciiText () {
"$c2 *++++++++++++++++++++* %s"
"$c2 @*++++++++++++++*@ %s"
"$c2 @#====#@ %s")
;;
;;

"Ubuntu")
if [[ "$no_color" != "1" ]]; then
Expand Down