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

Small optimization to guard against including the common script unnecessarily

Browse source
This commit is contained in:
Maarten van Gompel 2021-02-20 15:01:18 +01:00
parent 156f638a92
commit 6430537f55
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scripts/core/sxmo_common.sh
View file

@ -3,6 +3,9 @@
# This script is meant to be sourced by various sxmo scripts # This script is meant to be sourced by various sxmo scripts
# and defines some common settings # and defines some common settings
# Small optimization to guard against including the script unnecessarily
[ "$SXMO_COMMON_INCLUDED" -eq 1 ] && return 0;
# 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
@ -13,6 +16,8 @@ export CACHEDIR="$XDG_CACHE_HOME"/sxmo
# shellcheck disable=SC2034 # shellcheck disable=SC2034
export LOGDIR="$XDG_DATA_HOME"/sxmo/modem export LOGDIR="$XDG_DATA_HOME"/sxmo/modem
command -v "$KEYBOARD" || export KEYBOARD=svkbd-mobile-intl
# This script ensures all sxmo scripts are using the busybox version of # This script ensures all sxmo scripts are using the busybox version of
# certain coreutils rather than any other version that may be installed on the # certain coreutils rather than any other version that may be installed on the
# user's computer # user's computer
@ -22,7 +27,9 @@ alias pkill="busybox pkill"
alias pgrep="busybox pgrep" alias pgrep="busybox pgrep"
alias xargs="busybox xargs" alias xargs="busybox xargs"
[ "$SXMO_NO_ICONS" -eq 1 ] && return; SXMO_COMMON_INCLUDED=1
[ "$SXMO_NO_ICONS" -eq 1 ] && return 0;
#this script is meant to be sourced #this script is meant to be sourced
#the glyphs are often in the private use area and #the glyphs are often in the private use area and