From 05b0b4082a38b684bf4f79d985198f28aafc1c1a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 10 Apr 2014 19:27:17 -0400 Subject: de-clutter temp directories --- .config/login.sh | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/.config/login.sh b/.config/login.sh index d129b0f..a86f558 100644 --- a/.config/login.sh +++ b/.config/login.sh @@ -17,12 +17,29 @@ umask 022 # TMPDIR ############################################################# -if [[ ! -d "$HOME/tmp.$HOSTNAME" ]]; then +if [[ ! -d "$HOME/tmp/$HOSTNAME" ]]; then tmp="$(mktemp --tmpdir -d "$USER@$HOSTNAME-tmpdir.XXXXXXXXXXXXXXXXXXX")" - ln -sf "$tmp" "$HOME/tmp.$HOSTNAME" + mkdir -p -- "$HOME/tmp" + ln -sf "$tmp" "$HOME/tmp/$HOSTNAME" unset tmp fi -export TMPDIR="$HOME/tmp.$HOSTNAME" +export TMPDIR="$HOME/tmp/$HOSTNAME" +if type flock &>/dev/null; then + if [[ "$(readlink -f /dev/fd/7)" != "$(readlink -f "$TMPDIR/.uselock")" ]]; then + exec 7>"$TMPDIR/.uselock" + fi + if flock -sn 7; then + _logout_tmpdir_cleanup() { + if flock -xn 7; then + rm -rf -- "$(readlink -f "$TMPDIR")" + rm -- "$TMPDIR" + fi + } + trap _logout_tmpdir_cleanup EXIT + fi +fi + + # XDG ################################################################ -- cgit v1.2.3-2-g168b