at commit aea49c3: functions: Fix logic for get_os() function
To determine which OS the scripts are running on, check if the
build.prop file exists instead of using the lsb_release command.
If it does, then the scripts are running on Android; otherwise
it's Ubuntu.
>From the changelog, we can know get_os() expect to return 2(means android) if
build.prop file exists, but the code does not do that previouslly
Signed-off-by: Li Zhijian <lizhijian(a)cn.fujitsu.com>
---
include/functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/functions.sh b/include/functions.sh
index 10b8de8..0105776 100644
--- a/include/functions.sh
+++ b/include/functions.sh
@@ -425,7 +425,7 @@ sigtrap() {
get_os() {
build_prop_file="\system\build.prop"
- if [ -e "$build_prop_file" ]; then
+ if [ ! -e "$build_prop_file" ]; then
# for ubuntu
return 1
else
--
2.15.0.rc0
'ps' have different output between Android and ubuntu, and test suite
use get_os to determine which OS the scripts are running on.
at commit 84479a38, thermal: Get correct PID for heat_cpu based on OS
this patch want to get PID based on OS, but it looks thermal_06.sh foget to
add get_os before checking the OS.
Signed-off-by: Li Zhijian <lizhijian(a)cn.fujitsu.com>
---
thermal/thermal_06.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/thermal/thermal_06.sh b/thermal/thermal_06.sh
index d8bcd23..6fdc469 100755
--- a/thermal/thermal_06.sh
+++ b/thermal/thermal_06.sh
@@ -50,6 +50,7 @@ check_trip_point_change() {
trip_type=0
trip_type_path=0
$CPU_HEAT_BIN &
+ get_os
if [ $? -eq 1 ]; then
cpu_pid=$(ps | grep heat_cpu| awk '{print $1}')
else
--
2.15.0.rc0