~mil/sxmo-utils

e11cf9e5230ecf58a19c65c39a65a27a5b1688ed — Anjandev Momi 1 year, 27 days ago 65f1856
move sxmo data to XDG_DATA_HOME

Breaking change. Make sure you send an email to the mailing list
telling users to move their
$XDG_CONFIG_HOME/{modem,notifications} files/folders to
$XDG_DATA_HOME

Signed-off-by: Anjandev Momi <anjan@momi.ca>
M scripts/appscripts/sxmo_record.sh => scripts/appscripts/sxmo_record.sh +1 -1
@@ 1,5 1,5 @@
#!/usr/bin/env sh
[ -z "$SXMO_RECDIR" ] && SXMO_RECDIR=~/Recordings
[ -z "$SXMO_RECDIR" ] && SXMO_RECDIR="$XDG_DATA_HOME"/sxmo/recordings
mkdir -p "$SXMO_RECDIR"

getdur() {

M scripts/core/sxmo_appmenu.sh => scripts/core/sxmo_appmenu.sh +1 -1
@@ 1,7 1,7 @@
#!/usr/bin/env sh
trap gracefulexit INT TERM
WIN=$(xdotool getwindowfocus)
NOTIFDIR="$XDG_CONFIG_HOME"/sxmo/notifications
NOTIFDIR="$XDG_DATA_HOME"/sxmo/notifications

gracefulexit() {
	echo "Gracefully exiting $0"

M scripts/core/sxmo_contacts.sh => scripts/core/sxmo_contacts.sh +1 -1
@@ 9,7 9,7 @@
# Prints in output format: "number: contact"

CONTACTSFILE="$XDG_CONFIG_HOME"/sxmo/contacts.tsv
LOGFILE="$XDG_CONFIG_HOME"/sxmo/modem/modemlog.tsv
LOGFILE="$XDG_DATA_HOME"/sxmo/modem/modemlog.tsv

contacts() {
	grep -q . "$CONTACTSFILE" || echo " " > "$CONTACTSFILE"

M scripts/core/sxmo_statusbar.sh => scripts/core/sxmo_statusbar.sh +1 -1
@@ 8,7 8,7 @@ update() {
	if pgrep -f sxmo_modemcall.sh; then
		NOWS="$(date +"%s")"
		CALLSTARTS="$(date +"%s" -d "$(
			grep -aE 'call_start|call_pickup' "$XDG_CONFIG_HOME"/sxmo/modem/modemlog.tsv |
			grep -aE 'call_start|call_pickup' "$XDG_DATA_HOME"/sxmo/modem/modemlog.tsv |
			tail -n1 |
			cut -f1
		)")"

M scripts/modem/sxmo_modemcall.sh => scripts/modem/sxmo_modemcall.sh +2 -2
@@ 1,5 1,5 @@
#!/usr/bin/env sh
LOGDIR="$XDG_CONFIG_HOME"/sxmo/modem
LOGDIR="$XDG_DATA_HOME"/sxmo/modem
trap "gracefulexit" INT TERM

modem_n() {


@@ 199,4 199,4 @@ pickup() {
}

modem_n || fatalerr "Couldn't determine modem number - is modem online?"
"$@"
\ No newline at end of file
"$@"

M scripts/modem/sxmo_modemlog.sh => scripts/modem/sxmo_modemlog.sh +1 -1
@@ 1,3 1,3 @@
#!/usr/bin/env sh
LOGDIR="$XDG_CONFIG_HOME"/sxmo/modem
LOGDIR="$XDG_DATA_HOME"/sxmo/modem
st -f "Terminus-14" -e tail -n9999 -f "$LOGDIR"/modemlog.tsv

M scripts/modem/sxmo_modemmonitor.sh => scripts/modem/sxmo_modemmonitor.sh +2 -2
@@ 1,6 1,6 @@
#!/usr/bin/env sh
LOGDIR="$XDG_CONFIG_HOME"/sxmo/modem
NOTIFDIR="$XDG_CONFIG_HOME"/sxmo/notifications
LOGDIR="$XDG_DATA_HOME"/sxmo/modem
NOTIFDIR="$XDG_DATA_HOME"/sxmo/notifications
trap "gracefulexit" INT TERM

err() {

M scripts/modem/sxmo_modemsendsms.sh => scripts/modem/sxmo_modemsendsms.sh +1 -1
@@ 1,5 1,5 @@
#!/usr/bin/env sh
LOGDIR="$XDG_CONFIG_HOME"/sxmo/modem
LOGDIR="$XDG_DATA_HOME"/sxmo/modem

info() {
	echo "$1" > /dev/stderr

M scripts/modem/sxmo_modemtext.sh => scripts/modem/sxmo_modemtext.sh +2 -2
@@ 1,7 1,7 @@
#!/usr/bin/env sh
LOGDIR="$XDG_CONFIG_HOME"/sxmo/modem
LOGDIR="$XDG_DATA_HOME"/sxmo/modem
TERMMODE=$([ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ] && echo "true")
DRAFT_DIR="$XDG_CONFIG_HOME/sxmo/modem/draft"
DRAFT_DIR="$XDG_DATA_HOME/sxmo/modem/draft"

menu() {
	if [ "$TERMMODE" != "true" ]; then

M scripts/notifications/sxmo_notificationmonitor.sh => scripts/notifications/sxmo_notificationmonitor.sh +1 -1
@@ 1,6 1,6 @@
#!/usr/bin/env sh
trap gracefulexit INT TERM
NOTIFDIR="$XDG_CONFIG_HOME"/sxmo/notifications
NOTIFDIR="$XDG_DATA_HOME"/sxmo/notifications

gracefulexit() {
	echo "Gracefully exiting $0"

M scripts/notifications/sxmo_notificationsmenu.sh => scripts/notifications/sxmo_notificationsmenu.sh +1 -1
@@ 1,5 1,5 @@
#!/usr/bin/env sh
NOTIFDIR="$XDG_CONFIG_HOME"/sxmo/notifications
NOTIFDIR="$XDG_DATA_HOME"/sxmo/notifications

notificationmenu() {
	CHOICES="Close Menu\nClear Notifications"

M scripts/notifications/sxmo_notificationwrite.sh => scripts/notifications/sxmo_notificationwrite.sh +2 -2
@@ 1,5 1,5 @@
#!/usr/bin/env sh
NOTIFDIR="$XDG_CONFIG_HOME"/sxmo/notifications
NOTIFDIR="$XDG_DATA_HOME"/sxmo/notifications

# Takes 4 args:
# (1) the filepath of the notification to write (or random to generate a random id)


@@ 22,4 22,4 @@ writenotification() {
}

[ "$#" -lt 4 ] && echo "Need >=4 args to create a notification" && exit 1
writenotification
\ No newline at end of file
writenotification