Some functions in vbox scripts relied on language specific output.
Change-Id: I1c4be75336c2a8150f8f73a628185df2de19b16c Closes-Bug: 1376434
This commit is contained in:
parent
f38e6f194c
commit
4e137849b3
|
@ -24,10 +24,10 @@ get_available_memory() {
|
||||||
# runing on linux
|
# runing on linux
|
||||||
if [ "$(which free)" != "" ]; then
|
if [ "$(which free)" != "" ]; then
|
||||||
# using free
|
# using free
|
||||||
total_memory=$(free | grep Mem | awk '{print $2}')
|
total_memory=$(LANG=C free | grep Mem | awk '{print $2}')
|
||||||
elif [ $(which top) != '' ]; then
|
elif [ $(which top) != '' ]; then
|
||||||
# using top
|
# using top
|
||||||
total_memory=$(top -n 1 | grep "Mem:" | awk '{ print $4 }')
|
total_memory=$(LANG=C top -n 1 | grep "Mem:" | awk '{ print $4 }')
|
||||||
else
|
else
|
||||||
total_memory="-1"
|
total_memory="-1"
|
||||||
fi
|
fi
|
||||||
|
@ -44,13 +44,13 @@ get_available_memory() {
|
||||||
# runing on cygwin
|
# runing on cygwin
|
||||||
if [ "$(which free)" != "" ]; then
|
if [ "$(which free)" != "" ]; then
|
||||||
# using free
|
# using free
|
||||||
total_memory=$(free | grep Mem | awk '{print $2}')
|
total_memory=$(LANG=C free | grep Mem | awk '{print $2}')
|
||||||
elif [ $(which top) != '' ]; then
|
elif [ $(which top) != '' ]; then
|
||||||
# using top
|
# using top
|
||||||
total_memory=$(top -n 1 | grep "Mem:" | awk '{ print $4 }')
|
total_memory=$(LANG=C top -n 1 | grep "Mem:" | awk '{ print $4 }')
|
||||||
else
|
else
|
||||||
total_memory="-1"
|
total_memory="-1"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
echo $total_memory
|
echo $total_memory
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue