diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2015-02-16 11:37:46 -0500 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2015-02-16 11:37:46 -0500 |
| commit | 7a2dd3a7e3f465141c90abedcb814f9ee9712edd (patch) | |
| tree | 78a4911e665d84fc44d365573d24c593c705813e /.config/login.d/02_tmpdir.sh | |
| parent | c8f419eab92045a069c8f444c77c8ff81aa36fa2 (diff) | |
| parent | ca3e04971996ebe2eebf88775e96bbf547aa0abe (diff) | |
Merge remote-tracking branch 'origin/master' into purdue-cs/master
Conflicts:
.config/login.d/02_tmpdir.sh
.config/login.d/90_dot-runtime.sh
Diffstat (limited to '.config/login.d/02_tmpdir.sh')
| -rw-r--r-- | .config/login.d/02_tmpdir.sh | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/.config/login.d/02_tmpdir.sh b/.config/login.d/02_tmpdir.sh index 293064e..c0d5f18 100644 --- a/.config/login.d/02_tmpdir.sh +++ b/.config/login.d/02_tmpdir.sh @@ -1,21 +1,2 @@ -if [[ ! -d "$HOME/tmp/$HOSTNAME" ]]; then - tmp="$(mktemp --tmpdir -d "$USER@$HOSTNAME-tmpdir.XXXXXXXXXXXXXXXXXXX")" - mkdir -p -- "$HOME/tmp" - ln -sf "$tmp" "$HOME/tmp/$HOSTNAME" - unset tmp -fi -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 +mkdir -p -- "$XDG_RUNTIME_DIR/tmpdir" +export TMPDIR="$XDG_RUNTIME_DIR/tmpdir" |