~mil/sxmo-devel

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
2 3

[PATCH sxmo-utils] Fix SXMO_ vars in profile.d

Details
Message ID
<20220317162448.2328916-1-bruno.dupuis@protonmail.com>
DKIM signature
missing
Download raw message
Patch: +13 -13
After updating, sxmo_migrate.sh in a ssh session was broken, with
a strange error:

    usr/share/sxmo/migrations/1.9.0.0.sh: cd: line 8: can't cd to /home/user/.config/.config/.config/sxmo/hooks/: No such file or directory

This patch fix the issue introduced by c3991d4.

I'm not sure why phartman changed this in a second second version of
the patch, it was correct in the first one. Maybe I'm missing something.

---
 configs/profile.d/sxmo_init.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/configs/profile.d/sxmo_init.sh b/configs/profile.d/sxmo_init.sh
index d180402..c71b36b 100644
--- a/configs/profile.d/sxmo_init.sh
+++ b/configs/profile.d/sxmo_init.sh
@@ -39,22 +39,22 @@ _sxmo_load_environments() {
	fi
	export OS="${ID:-unknown}"

	export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME}/.local/share"
	export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME}/.cache"
	export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME}/.config"
	export XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME}/.local/state"
	export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
	export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
	export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
	export XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}"
	export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/dev/shm/user/$(id -u)}"

	export SXMO_CACHEDIR="${SXMO_CACHEDIR:-$XDG_CACHE_HOME}/sxmo"
	export SXMO_DEBUGLOG="${SXMO_DEBUGLOG:-$XDG_STATE_HOME}/tinydm.log"
	export SXMO_CACHEDIR="${SXMO_CACHEDIR:-$XDG_CACHE_HOME/sxmo}"
	export SXMO_DEBUGLOG="${SXMO_DEBUGLOG:-$XDG_STATE_HOME/tinydm.log}"

	export SXMO_BLOCKDIR="${SXMO_BLOCKDIR:-$SXMO_CACHEDIR}/block"
	export SXMO_BLOCKFILE="${SXMO_BLOCKFILE:-$SXMO_CACHEDIR}/block.tsv"
	export SXMO_CONTACTFILE="${SXMO_CONTACTFILE:-$SXMO_CACHEDIR}/contacts.tsv"
	export SXMO_STATE="${SXMO_STATE:-$XDG_RUNTIME_DIR}/sxmo.state"
	export SXMO_LOGDIR="${SXMO_LOGDIR:-$XDG_DATA_HOME}/sxmo/modem"
	export SXMO_NOTIFDIR="${SXMO_NOTIFDIR:-$SXMO_CACHEDIR}/notifications"
	export SXMO_UNSUSPENDREASONFILE="${SXMO_UNSUSPENDREASONFILE:-$XDG_RUNTIME_DIR}/sxmo.suspend.reason"
	export SXMO_BLOCKDIR="${SXMO_BLOCKDIR:-$SXMO_CACHEDIR/block}"
	export SXMO_BLOCKFILE="${SXMO_BLOCKFILE:-$SXMO_CACHEDIR/block.tsv}"
	export SXMO_CONTACTFILE="${SXMO_CONTACTFILE:-$SXMO_CACHEDIR/contacts.tsv}"
	export SXMO_STATE="${SXMO_STATE:-$XDG_RUNTIME_DIR/sxmo.state}"
	export SXMO_LOGDIR="${SXMO_LOGDIR:-$XDG_DATA_HOME/sxmo/modem}"
	export SXMO_NOTIFDIR="${SXMO_NOTIFDIR:-$SXMO_CACHEDIR/notifications}"
	export SXMO_UNSUSPENDREASONFILE="${SXMO_UNSUSPENDREASONFILE:-$XDG_RUNTIME_DIR/sxmo.suspend.reason}"

	export BEMENU_OPTS="${BEMENU_OPTS:---fn 'Monospace 14' --scrollbar autohide -s -n -w -c -l8 -M 40 -H 20}"

-- 
2.35.1

[sxmo-utils/patches/.build.yml] build success

builds.sr.ht <builds@sr.ht>
Details
Message ID
<CIMA6FAF3WGY.03X967UVUQMZ@cirno>
In-Reply-To
<20220317162448.2328916-1-bruno.dupuis@protonmail.com> (view parent)
DKIM signature
missing
Download raw message
sxmo-utils/patches/.build.yml: SUCCESS in 23s

[Fix SXMO_ vars in profile.d][0] from [Bruno Dupuis][1]

[0]: https://lists.sr.ht/~mil/sxmo-devel/patches/30306
[1]: bruno.dupuis@protonmail.com

✓ #717031 SUCCESS sxmo-utils/patches/.build.yml https://builds.sr.ht/~mil/job/717031
Details
Message ID
<YjeZIFSWYGYnPGtI@auriol.trilidun.org>
In-Reply-To
<20220317162448.2328916-1-bruno.dupuis@protonmail.com> (view parent)
DKIM signature
missing
Download raw message
Thanks, applied, good catch!


--
sic dicit magister P
https://phartman.sites.luc.edu/
GPG keyID 0xE0DBD3D6 (CAE6 3A6F 755F 7BC3 36CA  330D B3E6 39C6 E0DB D3D6)
Reply to thread Export thread (mbox)