From fa68e4a8bab90a575766c54a8ebca086d32e106c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 7 Feb 2015 14:37:55 -0500 Subject: xdg: Only try to flock if opening the lockfile worked --- .config/login.d/01_xdg.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to '.config/login.d') diff --git a/.config/login.d/01_xdg.sh b/.config/login.d/01_xdg.sh index 07cea90..d415608 100644 --- a/.config/login.d/01_xdg.sh +++ b/.config/login.d/01_xdg.sh @@ -29,9 +29,10 @@ if [[ -z $XDG_RUNTIME_DIR ]] && type flock &>/dev/null; then fi if ! [[ /dev/fd/7 -ef "$XDG_CACHE_HOME/xdg-runtime-dir/.lock" ]]; then exec 7>"$XDG_CACHE_HOME/xdg-runtime-dir/.lock" - fi - if flock -sn 7; then - trap _diy_xdg_runtime_logout EXIT + if flock -sn 7; then + # Unfortunately this doesn't survive across exec(1). + trap _diy_xdg_runtime_logout EXIT + fi fi } _diy_xdg_runtime_logout() { -- cgit v1.2.3 From a394973ffedc02a3ea622b353fecbd078b8c0f8e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 7 Feb 2015 14:38:51 -0500 Subject: Have the link to XDG_RUNTIME_DIR be at ~/.runtime/HOSTNAME --- .config/login.d/90_dot-runtime.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to '.config/login.d') diff --git a/.config/login.d/90_dot-runtime.sh b/.config/login.d/90_dot-runtime.sh index d597cc7..87d30ec 100644 --- a/.config/login.d/90_dot-runtime.sh +++ b/.config/login.d/90_dot-runtime.sh @@ -1 +1,4 @@ -ln -sfT -- "$XDG_RUNTIME_DIR" ~/.runtime +# This is really only needed for ssh ControlPath; as I don't have a +# way to communicate XD +mkdir -p -- ~/.runtime +ln -sfT -- "$XDG_RUNTIME_DIR" ~/.runtime/"$HOSTNAME" -- cgit v1.2.3 From 3f8f1c6c2026d6fb4a6d9280d982730afb8e762c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 7 Feb 2015 14:39:18 -0500 Subject: don't create the ~/tmp symlink --- .config/login.d/02_tmpdir.sh | 1 - 1 file changed, 1 deletion(-) (limited to '.config/login.d') diff --git a/.config/login.d/02_tmpdir.sh b/.config/login.d/02_tmpdir.sh index d0079aa..c0d5f18 100644 --- a/.config/login.d/02_tmpdir.sh +++ b/.config/login.d/02_tmpdir.sh @@ -1,3 +1,2 @@ mkdir -p -- "$XDG_RUNTIME_DIR/tmpdir" export TMPDIR="$XDG_RUNTIME_DIR/tmpdir" -ln -sfT -- "$TMPDIR" "$HOME/tmp" -- cgit v1.2.3 From 162e6fb23f50c7f60bfa0e0ad6d334dcc0777fcb Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 7 Feb 2015 14:39:40 -0500 Subject: set LESSHISTFILE --- .config/login.d/10_less.sh | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .config/login.d/10_less.sh (limited to '.config/login.d') diff --git a/.config/login.d/10_less.sh b/.config/login.d/10_less.sh new file mode 100644 index 0000000..c5934d6 --- /dev/null +++ b/.config/login.d/10_less.sh @@ -0,0 +1,2 @@ +export LESSHISTFILE="$XDG_CACHE_HOME/less/histfile" +mkdir -p -- "${LESSHISTFILE%/*}" -- cgit v1.2.3 From a6fe4bac238a28521aa1a4fec3f5c690eab9eae3 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 9 Feb 2015 22:15:40 -0500 Subject: xdg.sh: make readable by /bin/sh --- .config/login.d/01_xdg.sh | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to '.config/login.d') diff --git a/.config/login.d/01_xdg.sh b/.config/login.d/01_xdg.sh index d415608..4464764 100644 --- a/.config/login.d/01_xdg.sh +++ b/.config/login.d/01_xdg.sh @@ -1,33 +1,32 @@ -#!/bin/bash -# This should be readable by /bin/sh, but I'm going to assume bash. +# This should be readable by /bin/sh # Sets up XDG environmental variables, so programs using them don't have to # worry about checking if they are set. # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html -[[ -n $XDG_DATA_HOME ]] || export XDG_DATA_HOME="$HOME/.local/share" -[[ -n $XDG_CONFIG_HOME ]] || export XDG_CONFIG_HOME="$HOME/.config" -[[ -n $XDG_DATA_DIRS ]] || export XDG_DATA_DIRS="/usr/local/share/:/usr/share/" -[[ -n $XDG_CONFIG_DIRS ]] || export XDG_CONFIG_DIRS="/etc/xdg" -[[ -n $XDG_CACHE_HOME ]] || export XDG_CACHE_HOME="$HOME/.cache" +[ -n "$XDG_DATA_HOME" ] || export XDG_DATA_HOME="$HOME/.local/share" +[ -n "$XDG_CONFIG_HOME" ] || export XDG_CONFIG_HOME="$HOME/.config" +[ -n "$XDG_DATA_DIRS" ] || export XDG_DATA_DIRS="/usr/local/share/:/usr/share/" +[ -n "$XDG_CONFIG_DIRS" ] || export XDG_CONFIG_DIRS="/etc/xdg" +[ -n "$XDG_CACHE_HOME" ] || export XDG_CACHE_HOME="$HOME/.cache" # Check if XDG_RUNTIME_DIR is set, but has a bogus setting -if [[ -n $XDG_RUNTIME_DIR ]] && [[ ! -d $XDG_RUNTIME_DIR ]]; then +if [ -n "$XDG_RUNTIME_DIR" ] && [ ! -d "$XDG_RUNTIME_DIR" ]; then unset XDG_RUNTIME_DIR fi # Set XDG_RUNTIME_DIR if we can -if [[ -z $XDG_RUNTIME_DIR ]] && type flock &>/dev/null; then +if [ -z "$XDG_RUNTIME_DIR" ] && type flock &>/dev/null; then _diy_xdg_runtime_login() { export XDG_RUNTIME_DIR="$XDG_CACHE_HOME/xdg-runtime-dir/$HOSTNAME" # There's a race condition here, between the `ln -s` and `flock`. # But it's not like I'll be hammering a box with logins. - if [[ ! -d "$XDG_RUNTIME_DIR" ]]; then + if [ ! -d "$XDG_RUNTIME_DIR" ]; then local tmp="$(mktemp -d --tmpdir -- "${USER}@${HOSTNAME}-runtime.XXXXXXXXXX")" mkdir -p -- "$XDG_CACHE_HOME/xdg-runtime-dir" ln -sfT -- "$tmp" "$XDG_RUNTIME_DIR" fi - if ! [[ /dev/fd/7 -ef "$XDG_CACHE_HOME/xdg-runtime-dir/.lock" ]]; then + if ! [ /dev/fd/7 -ef "$XDG_CACHE_HOME/xdg-runtime-dir/.lock" ]; then exec 7>"$XDG_CACHE_HOME/xdg-runtime-dir/.lock" if flock -sn 7; then # Unfortunately this doesn't survive across exec(1). -- cgit v1.2.3 From ca3e04971996ebe2eebf88775e96bbf547aa0abe Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 9 Feb 2015 22:17:02 -0500 Subject: path.sh, config-path: don't rely on external programs (sed) --- .config/login.d/00_path.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to '.config/login.d') diff --git a/.config/login.d/00_path.sh b/.config/login.d/00_path.sh index a45f8fd..f4ca3a6 100644 --- a/.config/login.d/00_path.sh +++ b/.config/login.d/00_path.sh @@ -1,9 +1,7 @@ -#!/bin/sh - if type config-path &>/dev/null; then config_path=config-path else # Bootstrap finding config-path config_path="$HOME/.local/bin/config-path" fi -eval "$("$config_path" | sed 's/^/export /')" +eval "$(IFS=$'\n'; lines=($("$config_path")); printf -- 'export %s\n' "${lines[@]}")" -- cgit v1.2.3