Merge remote-tracking branch 'origin/master' into purdue-cs/master

Conflicts:
	.config/X11/clientrc
	.config/bash/rc.d/emacs.sh
	.config/cron/make-config
	.config/emacs/custom.el
	.config/emacs/init.el
	.config/git/config
	.config/login.sh
	.config/selected_editor
	.local/bin/config-path

1 files changed, 4 insertions, 87 deletions

diff --git a/.config/login.sh b/.config/login.sh
index 09c768a..353861a 100644
--- a/.config/login.sh
+++ b/.config/login.sh
@@ -9,91 +9,8 @@
 
 # the default umask is set in /etc/profile; for setting the umask
 # for ssh logins, install and configure the libpam-umask package.
-umask 022
 
-## Paths #############################################################
-
-. "$HOME/.local/lib/path.sh"
-
-# TMPDIR #############################################################
-
-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
-
-
-
-# XDG ################################################################
-
-. "$HOME/.local/lib/xdg.sh"
-mkdir -p -- "$HOME/.runtime"
-ln -sfT -- "$XDG_RUNTIME_DIR" "$HOME/.runtime/$HOSTNAME"
-
-# Box-specific stuff #################################################
-
-if [[ -f "$XDG_CONFIG_HOME/login.local.sh" ]]; then
-	. "$XDG_CONFIG_HOME/login.local.sh"
-fi
-
-# Settings ###########################################################
-
-# Spell check
-if [[ -z "$DICTIONARY" ]] && [[ -n "$LANG" ]]; then
-	export DICTIONARY="${LANG%%.*}"
-fi
-
-# Text editor
-if [[ -f "$HOME/.selected_editor" ]]; then
-	. "$HOME/.selected_editor"
-	export SELECTED_EDITOR
-	export ALTERNATE_EDITOR
-	export EDITOR="${EDITOR:-$SELECTED_EDITOR}"
-	export VISUAL="${VISUAL:-$SELECTED_EDITOR}"
-fi
-
-# GPG
-if [[ -z $GPGKEY ]] && [[ -f "${HOME}/.gnupg/gpg.conf" ]]; then
-	echo 'login: Setting GPGKEY'
-	export GPGKEY=`sed -nr 's/^\s*default-key\s+//p' "${HOME}/.gnupg/gpg.conf"`
-fi
-if [[ -f $XDG_RUNTIME_DIR/gpg ]]; then
-	echo 'login: Setting gpg-agent info:'
-	cat "$XDG_RUNTIME_DIR/gpg"
-	. "$XDG_RUNTIME_DIR/gpg"
-	export GPG_AGENT_INFO
-	#export SSH_AUTH_SOCK
-fi
-
-# Java
-_JAVA_OPTIONS=''
-_JAVA_OPTIONS+=' -Dawt.useSystemAAFontSettings=on'
-_JAVA_OPTIONS+=' -Dswing.aatext=true'
-_JAVA_OPTIONS+=' -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel'
-if [[ -n $TMPDIR ]]; then
-	_JAVA_OPTIONS+=" -Djava.io.tmpdir=$TMPDIR"
-fi
-export _JAVA_OPTIONS
-
-# X11
-if [[ -z $XAUTHORITY ]]; then
-	export XAUTHORITY="$HOME/.Xauthority"
-	#export XAUTHORITY=$XDG_RUNTIME_DIR/Xauthority
-fi
+for file in "${XDG_CONFIG_HOME:-$HOME/.config}/login.d/"*.sh; do
+	. "$file"
+done
+unset file