jab2870/sxmo-utils
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move operating system detection to sxmo_common

Browse source 
Signed-off-by: Stacy Harper <contact@stacyharper.net>
This commit is contained in:
Maxim Karasev 2021-09-04 23:22:39 +03:00 • committed by Stacy Harper
parent 2e965453c1
commit f7698e4a25
No known key found for this signature in database
GPG key ID: 5BAC92328B7C5D65
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/core/sxmo_common.sh
View file

@ -9,6 +9,16 @@
# we disable shellcheck SC2034 (variable not used) # we disable shellcheck SC2034 (variable not used)
# for all the variables we define here # for all the variables we define here
# Determine current operating system
if [ -f /etc/os-release ]; then
# freedesktop.org and systemd
# shellcheck disable=SC2034
. /etc/os-release
export OS="$NAME"
else
export OS="Unknown"
fi
# shellcheck disable=SC2034 # shellcheck disable=SC2034
export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-$HOME/.local/run}" export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-$HOME/.local/run}"
# shellcheck disable=SC2034 # shellcheck disable=SC2034

8
scripts/modem/sxmo_modemmonitortoggle.sh
View file

@ -10,14 +10,6 @@
# shellcheck source=scripts/core/sxmo_common.sh # shellcheck source=scripts/core/sxmo_common.sh
. "$(dirname "$0")/sxmo_common.sh" . "$(dirname "$0")/sxmo_common.sh"
if [ -f /etc/os-release ]; then
# freedesktop.org and systemd
. /etc/os-release
OS=$NAME
else
OS="Unknown"
fi
daemon_start() { daemon_start() {
case "$OS" in case "$OS" in
"Alpine Linux"|postmarketOS) "Alpine Linux"|postmarketOS)