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

Load user .profile after setting up default values

Browse source 
This allow the user .profile to switch case depending on the default
values. It is mandatory by example to setup custom wvkbd or svkbd,
depending on the wm we use.

Signed-off-by: Stacy Harper <contact@stacyharper.net>
Signed-off-by: Maarten van Gompel <proycon@anaproy.nl>
This commit is contained in:
Stacy Harper 2021-08-26 12:10:53 +02:00 • committed by Maarten van Gompel
parent 1ca8672473
commit c014c6bb92
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/core/sxmo_winit.sh
View file

@ -5,14 +5,14 @@ envvars() {
# shellcheck disable=SC1091 # shellcheck disable=SC1091
[ -f /etc/profile ] && . /etc/profile [ -f /etc/profile ] && . /etc/profile
export BEMENU_OPTS='--fn "Monospace 11"' export BEMENU_OPTS='--fn "Monospace 11"'
# shellcheck source=/dev/null
[ -f "$HOME"/.profile ] && . "$HOME"/.profile
export MOZ_ENABLE_WAYLAND=1 export MOZ_ENABLE_WAYLAND=1
command -v "$TERMCMD" || export TERMCMD="foot" command -v "$TERMCMD" || export TERMCMD="foot"
command -v "$BROWSER" || export BROWSER=firefox command -v "$BROWSER" || export BROWSER=firefox
command -v "$EDITOR" || export EDITOR=vis command -v "$EDITOR" || export EDITOR=vis
command -v "$SHELL" || export SHELL=/bin/sh command -v "$SHELL" || export SHELL=/bin/sh
command -v "$KEYBOARD" || defaultkeyboard command -v "$KEYBOARD" || export KEYBOARD=wvkbd-mobintl
# shellcheck source=/dev/null
[ -f "$HOME"/.profile ] && . "$HOME"/.profile
[ -z "$MPV_HOME" ] && export MPV_HOME=/usr/share/sxmo/mpv [ -z "$MPV_HOME" ] && export MPV_HOME=/usr/share/sxmo/mpv
[ -z "$MOZ_USE_XINPUT2" ] && export MOZ_USE_XINPUT2=1 [ -z "$MOZ_USE_XINPUT2" ] && export MOZ_USE_XINPUT2=1
[ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME=~/.config [ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME=~/.config
@ -44,10 +44,6 @@ defaults() {
[ -e "$HOME"/.Xresources ] && xrdb -merge "$HOME"/.Xresources [ -e "$HOME"/.Xresources ] && xrdb -merge "$HOME"/.Xresources
} }
defaultkeyboard() {
export KEYBOARD=wvkbd
}
defaultconfig() { defaultconfig() {
if [ ! -r "$2" ]; then if [ ! -r "$2" ]; then
mkdir -p "$(dirname "$2")" mkdir -p "$(dirname "$2")"

4
scripts/core/sxmo_xinit.sh
View file

@ -4,13 +4,13 @@
envvars() { envvars() {
# shellcheck disable=SC1091 # shellcheck disable=SC1091
[ -f /etc/profile ] && . /etc/profile [ -f /etc/profile ] && . /etc/profile
# shellcheck source=/dev/null
[ -f "$HOME"/.profile ] && . "$HOME"/.profile
command -v "$TERMCMD" || export TERMCMD="st -e" command -v "$TERMCMD" || export TERMCMD="st -e"
command -v "$BROWSER" || export BROWSER=surf command -v "$BROWSER" || export BROWSER=surf
command -v "$EDITOR" || export EDITOR=vis command -v "$EDITOR" || export EDITOR=vis
command -v "$SHELL" || export SHELL=/bin/sh command -v "$SHELL" || export SHELL=/bin/sh
command -v "$KEYBOARD" || defaultkeyboard command -v "$KEYBOARD" || defaultkeyboard
# shellcheck source=/dev/null
[ -f "$HOME"/.profile ] && . "$HOME"/.profile
[ -z "$MPV_HOME" ] && export MPV_HOME=/usr/share/sxmo/mpv [ -z "$MPV_HOME" ] && export MPV_HOME=/usr/share/sxmo/mpv
[ -z "$MOZ_USE_XINPUT2" ] && export MOZ_USE_XINPUT2=1 [ -z "$MOZ_USE_XINPUT2" ] && export MOZ_USE_XINPUT2=1
[ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME=~/.config [ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME=~/.config