From 422d106fbab5505f3810fa845f4f71547c7a4332 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Wed, 8 Apr 2020 17:21:40 -0400 Subject: assume default values if xdg dirs not set --- .profile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to '.profile') diff --git a/.profile b/.profile index fdc94ec..d067c73 100644 --- a/.profile +++ b/.profile @@ -3,8 +3,8 @@ # Adds `~/.local/bin` to $PATH export PATH="$PATH:$(du "$HOME/.local/bin/" | cut -f2 | tr '\n' ':' | sed 's/:*$//')" -# Get default LARBS WM from $XDG_DATA_HOME/larbs/wm -export LARBSWM="$(cat $XDG_DATA_HOME/larbs/wm 2>/dev/null)" && +# Get default LARBS WM from ${XDG_DATA_HOME:$HOME/.local/share}/larbs/wm +export LARBSWM="$(cat ${XDG_DATA_HOME:$HOME/.local/share}/larbs/wm 2>/dev/null)" && [ "$LARBSWM" = "dwm" ] || export LARBSWM="i3" # Default programs: @@ -19,16 +19,16 @@ eval "$(sed 's/^[^#].*/export &/g;t;d' ~/.config/user-dirs.dirs)" # ~/ Clean-up: #export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # This line will break some DMs. -export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch-config" -export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0" +export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:$HOME/.config}/notmuch-config" +export GTK2_RC_FILES="${XDG_CONFIG_HOME:$HOME/.config}/gtk-2.0/gtkrc-2.0" export LESSHISTFILE="-" -export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc" -export INPUTRC="$XDG_CONFIG_HOME/inputrc" -export ZDOTDIR="$XDG_CONFIG_HOME/zsh" -export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store" +export WGETRC="${XDG_CONFIG_HOME:$HOME/.config}/wget/wgetrc" +export INPUTRC="${XDG_CONFIG_HOME:$HOME/.config}/inputrc" +export ZDOTDIR="${XDG_CONFIG_HOME:$HOME/.config}/zsh" +export PASSWORD_STORE_DIR="${XDG_DATA_HOME:$HOME/.local/share}/password-store" export TMUX_TMPDIR="$XDG_RUNTIME_DIR" -export ANDROID_SDK_HOME="$XDG_CONFIG_HOME/android" -export CARGO_HOME="$XDG_DATA_HOME/cargo" +export ANDROID_SDK_HOME="${XDG_CONFIG_HOME:$HOME/.config}/android" +export CARGO_HOME="${XDG_DATA_HOME:$HOME/.local/share}/cargo" # Other program settings: export DICS="/usr/share/stardict/dic/" @@ -43,10 +43,10 @@ export LESS_TERMCAP_se="$(printf '%b' '')" export LESS_TERMCAP_us="$(printf '%b' '')" export LESS_TERMCAP_ue="$(printf '%b' '')" -[ ! -f $XDG_CONFIG_HOME/shortcutrc ] && shortcuts >/dev/null 2>&1 +[ ! -f ${XDG_CONFIG_HOME:$HOME/.config}/shortcutrc ] && shortcuts >/dev/null 2>&1 # Start graphical server on tty1 if not already running. [ "$(tty)" = "/dev/tty1" ] && ! pgrep -x Xorg >/dev/null && exec startx # Switch escape and caps if tty and no passwd required: -sudo -n loadkeys $XDG_DATA_HOME/larbs/ttymaps.kmap 2>/dev/null +sudo -n loadkeys ${XDG_DATA_HOME:$HOME/.local/share}/larbs/ttymaps.kmap 2>/dev/null -- cgit v1.3.1