YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1440 from ewilly/patch-1

Browse source 
Avoid grep issue with vmstat command
This commit is contained in:
Alexandre Aubin 2022-02-13 21:25:36 +01:00 • committed by GitHub
commit ab0b66425c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
helpers/hardware
View file

@ -30,8 +30,8 @@ ynh_get_ram() {
ram=0
# Use the total amount of ram
elif [ $free -eq 1 ]; then
local free_ram=$(vmstat --stats --unit M | grep "free memory" | awk '{print $1}')
local free_swap=$(vmstat --stats --unit M | grep "free swap" | awk '{print $1}')
local free_ram=$(LANG=C vmstat --stats --unit M | grep "free memory" | awk '{print $1}')
local free_swap=$(LANG=C vmstat --stats --unit M | grep "free swap" | awk '{print $1}')
local free_ram_swap=$((free_ram + free_swap))
# Use the total amount of free ram
@ -44,8 +44,8 @@ ynh_get_ram() {
ram=$free_swap
fi
elif [ $total -eq 1 ]; then
local total_ram=$(vmstat --stats --unit M | grep "total memory" | awk '{print $1}')
local total_swap=$(vmstat --stats --unit M | grep "total swap" | awk '{print $1}')
local total_ram=$(LANG=C vmstat --stats --unit M | grep "total memory" | awk '{print $1}')
local total_swap=$(LANG=C vmstat --stats --unit M | grep "total swap" | awk '{print $1}')
local total_ram_swap=$((total_ram + total_swap))
local ram=$total_ram_swap