From b780c946dc5d61cd00988a62aa281155ffb89363 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 11 Jun 2015 09:05:31 -0600 Subject: fix XDG_RUNTIME_DIR management --- .config/login.d/02_xdg_runtime_dir.sh | 17 +++++++++-------- .config/login.d/90_dot-runtime.sh | 4 ++++ .config/login.d/90_symlink_xdg_runtime_dir.sh | 7 ------- .config/symlinks | 2 -- 4 files changed, 13 insertions(+), 17 deletions(-) create mode 100644 .config/login.d/90_dot-runtime.sh delete mode 100644 .config/login.d/90_symlink_xdg_runtime_dir.sh diff --git a/.config/login.d/02_xdg_runtime_dir.sh b/.config/login.d/02_xdg_runtime_dir.sh index 6700669..864eadd 100644 --- a/.config/login.d/02_xdg_runtime_dir.sh +++ b/.config/login.d/02_xdg_runtime_dir.sh @@ -4,22 +4,23 @@ if [ -z "$XDG_RUNTIME_DIR" ] && shopt -q login_shell && 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 - 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 exec 7>"$XDG_CACHE_HOME/xdg-runtime-dir/.lock" - if flock -sn 7; then + if flock -xn 7; 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 # Unfortunately this doesn't survive across exec(1). trap _diy_xdg_runtime_logout EXIT + flock -sn 7 fi fi } _diy_xdg_runtime_logout() { + exec 7>&- + exec 7>"$XDG_CACHE_HOME/xdg-runtime-dir/.lock" if flock -xn 7; then rm -rf -- "$(readlink "$XDG_RUNTIME_DIR")" fi diff --git a/.config/login.d/90_dot-runtime.sh b/.config/login.d/90_dot-runtime.sh new file mode 100644 index 0000000..d06568f --- /dev/null +++ b/.config/login.d/90_dot-runtime.sh @@ -0,0 +1,4 @@ +# This is really only needed for ssh ControlPath; as I don't have a +# way to communicate XDG_RUNTIME_DIR to it otherwise. +mkdir -p -- ~/.runtime +ln -sfT -- "$XDG_RUNTIME_DIR" ~/.runtime/"$HOSTNAME" diff --git a/.config/login.d/90_symlink_xdg_runtime_dir.sh b/.config/login.d/90_symlink_xdg_runtime_dir.sh deleted file mode 100644 index 7ee4bba..0000000 --- a/.config/login.d/90_symlink_xdg_runtime_dir.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/hint/sh -# This is really only needed for ssh ControlPath; as I don't have a -# way to communicate XDG_RUNTIME_DIR -if [ -n "$XDG_RUNTIME_DIR" ]; then - mkdir -p -- "$XDG_CACHE_HOME/xdg-runtime-dir" - ln -sfT -- "$XDG_RUNTIME_DIR" "$XDG_CACHE_HOME/xdg-runtime-dir/$HOSTNAME" -fi diff --git a/.config/symlinks b/.config/symlinks index 80cffc1..9896e0c 100644 --- a/.config/symlinks +++ b/.config/symlinks @@ -44,8 +44,6 @@ # .maildirproc is not used, but must exist /tmp/ .maildirproc -# There's a silly maximum length on Domain Sockets, so alias -.cache/xdg-runtime-dir/ .runtime # KDE .config/ .kde/share/apps # -- cgit v1.2.3 From ad70cc9c05bda02de3bd06c910cec54863e8c024 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 11 Jun 2015 09:05:48 -0600 Subject: Don't put CPAN in .config --- .config/symlinks | 1 - 1 file changed, 1 deletion(-) diff --git a/.config/symlinks b/.config/symlinks index 9896e0c..c99afba 100644 --- a/.config/symlinks +++ b/.config/symlinks @@ -31,7 +31,6 @@ # Directories .config/arduino/ .arduino .config/bazaar/ .bazaar -.config/cpan/ .cpan .config/emacs/ .emacs.d .config/icons/ .icons .config/mozilla/ .mozilla # -- cgit v1.2.3 From dd24df5f3765e0771d91892824298349c367fddb Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 11 Jun 2015 09:08:29 -0600 Subject: set MAKEFLAGS to -j$(nproc) on login --- .config/login.d/10_makeflags.sh | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .config/login.d/10_makeflags.sh diff --git a/.config/login.d/10_makeflags.sh b/.config/login.d/10_makeflags.sh new file mode 100644 index 0000000..671c6d3 --- /dev/null +++ b/.config/login.d/10_makeflags.sh @@ -0,0 +1,2 @@ +#!/hint/sh +export MAKEFLAGS="-j$(nproc)" -- cgit v1.2.3 From f97389c74b4642da8a8c313a48e907e014a6ed50 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 19 Jul 2015 19:10:14 -0600 Subject: cron/make-config: use moreutils chronic --- .config/cron/make-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/cron/make-config b/.config/cron/make-config index 6a7e9d6..a4a3480 100644 --- a/.config/cron/make-config +++ b/.config/cron/make-config @@ -1,2 +1,2 @@ #m h dom mon dow command -*/5 * * * * cronic make -C ~/.config +*/5 * * * * chronic make -C ~/.config -- cgit v1.2.3 From 369f1aeccf80323edddde34b4a5f3cd7d5234432 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 19 Jul 2015 19:10:43 -0600 Subject: ssh: recognize moore$N as Purdue boxes --- .config/ssh/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/ssh/config b/.config/ssh/config index 8649e61..dc32703 100644 --- a/.config/ssh/config +++ b/.config/ssh/config @@ -6,7 +6,7 @@ Host * # Purdue ################################################### -Host data lore borg?? xinu?? sac?? sslab?? +Host data lore borg?? xinu?? sac?? sslab?? moore?? HostName %h.cs.purdue.edu User shumakl Host *.cs.purdue.edu -- cgit v1.2.3