Merge pull request #894 from dawidd6/openwrt_release

distro: fix OpenWrt/LEDE detection
This commit is contained in:
Dylan Araps 2018-01-14 10:12:57 +11:00 committed by GitHub
commit 5889f1fe8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions

View File

@ -122,8 +122,10 @@ get_distro() {
elif [[ -d "/system/app/" && -d "/system/priv-app" ]]; then
distro="Android $(getprop ro.build.version.release)"
elif [[ -f "/etc/os-release" || -f "/usr/lib/os-release" ]]; then
files=("/etc/os-release" "/usr/lib/os-release")
elif [[ -f "/etc/os-release" || \
-f "/usr/lib/os-release" || \
-f "/etc/openwrt_release" ]]; then
files=("/etc/os-release" "/usr/lib/os-release" "/etc/openwrt_release")
# Source the os-release file
for file in "${files[@]}"; do
@ -231,7 +233,7 @@ get_distro() {
"IRIX")
distro="IRIX ${kernel_version}"
;;
"FreeMiNT")
distro="FreeMiNT"
;;
@ -682,7 +684,7 @@ get_de() {
*neod*) de="NeoDesk" ;;
*zdesk*) de="zDesk" ;;
*mdesk*) de="mDesk" ;;
esac
esac
done
;;
@ -805,7 +807,7 @@ get_wm() {
*myaes*) wm="MyAES" ;;
*naes*) wm="N.AES" ;;
geneva) wm="Geneva" ;;
esac
esac
done
;;
esac
@ -1239,7 +1241,7 @@ get_cpu_usage() {
"iPhone OS") cores="${cpu/*\(}"; cores="${cores/\)*}" ;;
"AIX") cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')" ;;
"IRIX") cores="$(sysconf NPROC_ONLN)" ;;
"FreeMiNT") cores="$(sysctl -n hw.ncpu)"
"FreeMiNT") cores="$(sysctl -n hw.ncpu)"
esac
fi