aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2020-06-10 23:06:26 +1200
committerTom Ryder <tom@sanctum.geek.nz>2020-06-10 23:06:26 +1200
commit99b17e8152fd5e2bed0839d2b4aa87cc63229ea9 (patch)
treeaf3480291ebb1836f2d6ddf024579abd640d63ca
parentMerge branch 'release/v9.20.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-99b17e8152fd5e2bed0839d2b4aa87cc63229ea9.tar.gz
dotfiles-99b17e8152fd5e2bed0839d2b4aa87cc63229ea9.zip
Merge branch 'release/v9.21.0'v9.21.0
* release/v9.21.0: Use XDG path for login welcome config Adjust ~/.hushlogin test in login welcome script Restrict extensions of installed .d files
-rw-r--r--Makefile50
-rw-r--r--VERSION4
-rw-r--r--sh/profile.d/welcome.sh6
3 files changed, 30 insertions, 30 deletions
diff --git a/Makefile b/Makefile
index 0613ea05..5fb6664b 100644
--- a/Makefile
+++ b/Makefile
@@ -377,7 +377,7 @@ install-abook:
install-bash: check-bash install-sh bin/han
mkdir -p -- $(HOME)/.bashrc.d $(HOME)/.local/bin
cp -p -- bash/bashrc $(HOME)/.bashrc
- cp -p -- bash/bashrc.d/* $(HOME)/.bashrc.d
+ cp -p -- bash/bashrc.d/*.bash $(HOME)/.bashrc.d
cp -p -- bash/bash_profile $(HOME)/.bash_profile
cp -p -- bash/bash_logout $(HOME)/.bash_logout
cp -p -- bin/han $(HOME)/.local/bin
@@ -385,7 +385,7 @@ install-bash: check-bash install-sh bin/han
install-bash-completion: install-bash
mkdir -p -- $(HOME)/.bash_completion.d $(XDG_CONFIG_HOME)
cp -p -- bash/bash_completion $(XDG_CONFIG_HOME)
- cp -p -- bash/bash_completion.d/* $(HOME)/.bash_completion.d
+ cp -p -- bash/bash_completion.d/*.bash $(HOME)/.bash_completion.d
install-bin: $(BINS) install-bin-man
mkdir -p -- $(HOME)/.local/bin
@@ -440,7 +440,7 @@ install-git: git/config $(GIT_TEMPLATE_HOOKS)
$(XDG_CONFIG_HOME)/git/template/hooks
install-gnupg: gnupg/profile.d/gnupg.sh install-sh
- cp -p -- gnupg/profile.d/* $(HOME)/.profile.d
+ cp -p -- gnupg/profile.d/*.sh $(HOME)/.profile.d
install-gtk:
mkdir -p -- $(XDG_CONFIG_HOME)/gtk-3.0
@@ -452,12 +452,12 @@ install-i3: install-x
cp -p -- i3/* $(XDG_CONFIG_HOME)/i3
install-keychain: install-sh
- cp -p -- keychain/profile.d/* $(HOME)/.profile.d
- cp -p -- keychain/shrc.d/* $(HOME)/.shrc.d
+ cp -p -- keychain/profile.d/*.sh $(HOME)/.profile.d
+ cp -p -- keychain/shrc.d/*.sh $(HOME)/.shrc.d
install-less: less/less
mkdir -p -- $(HOME)/.profile.d
- cp -- less/profile.d/* $(HOME)/.profile.d
+ cp -- less/profile.d/*.sh $(HOME)/.profile.d
mkdir -p -- $(XDG_CONFIG_HOME)/less
cp -p -- less/less $(XDG_CONFIG_HOME)/less/key
@@ -470,7 +470,7 @@ install-man:
install-mpd: install-sh
mkdir -p -- $(HOME)/.mpd/playlists
- cp -p -- mpd/profile.d/* $(HOME)/.profile.d
+ cp -p -- mpd/profile.d/*.sh $(HOME)/.profile.d
cp -p -- mpd/mpdconf $(HOME)/.mpdconf
install-mpv:
@@ -511,37 +511,37 @@ install-mysql:
install-ksh: check-ksh install-sh
mkdir -p -- $(HOME)/.kshrc.d
- cp -p -- ksh/shrc.d/* $(HOME)/.shrc.d
+ cp -p -- ksh/shrc.d/*.sh $(HOME)/.shrc.d
cp -p -- ksh/kshrc $(HOME)/.kshrc
- cp -p -- ksh/kshrc.d/* $(HOME)/.kshrc.d
+ cp -p -- ksh/kshrc.d/*.ksh $(HOME)/.kshrc.d
install-login-shell: check-login-shell
sh install/login-shell.sh
install-perlcritic: install-sh
- cp -p -- perlcritic/profile.d/* $(HOME)/.profile.d
+ cp -p -- perlcritic/profile.d/*.sh $(HOME)/.profile.d
mkdir -p -- $(XDG_CONFIG_HOME)/perlcritic
cp -p -- perlcritic/perlcriticrc $(XDG_CONFIG_HOME)/perlcritic/perlcriticrc
install-perltidy: install-sh
- cp -p -- perltidy/profile.d/* $(HOME)/.profile.d
+ cp -p -- perltidy/profile.d/*.sh $(HOME)/.profile.d
mkdir -p -- $(XDG_CONFIG_HOME)/perltidy
cp -p -- perltidy/perltidyrc $(XDG_CONFIG_HOME)/perltidy/perltidyrc
install-plenv: install-sh
- cp -p -- plenv/profile.d/* $(HOME)/.profile.d
- cp -p -- plenv/shrc.d/* $(HOME)/.shrc.d
+ cp -p -- plenv/profile.d/*.sh $(HOME)/.profile.d
+ cp -p -- plenv/shrc.d/*.sh $(HOME)/.shrc.d
install-psql:
cp -p -- psql/psqlrc $(HOME)/.psqlrc
install-pyenv: install-sh
- cp -p -- pyenv/profile.d/* $(HOME)/.profile.d
- cp -p -- pyenv/shrc.d/* $(HOME)/.shrc.d
+ cp -p -- pyenv/profile.d/*.sh $(HOME)/.profile.d
+ cp -p -- pyenv/shrc.d/*.sh $(HOME)/.shrc.d
install-rbenv: install-sh
- cp -p -- rbenv/profile.d/* $(HOME)/.profile.d
- cp -p -- rbenv/shrc.d/* $(HOME)/.shrc.d
+ cp -p -- rbenv/profile.d/*.sh $(HOME)/.profile.d
+ cp -p -- rbenv/shrc.d/*.sh $(HOME)/.shrc.d
install-readline:
cp -p -- readline/inputrc $(HOME)/.inputrc
@@ -549,10 +549,10 @@ install-readline:
install-sh: check-sh
mkdir -p -- $(HOME)/.profile.d $(HOME)/.shrc.d
cp -p -- sh/profile $(HOME)/.profile
- cp -p -- sh/profile.d/* $(HOME)/.profile.d
+ cp -p -- sh/profile.d/*.sh $(HOME)/.profile.d
cp -p -- sh/shinit $(HOME)/.shinit
cp -p -- sh/shrc $(HOME)/.shrc
- cp -p -- sh/shrc.d/* $(HOME)/.shrc.d
+ cp -p -- sh/shrc.d/*.sh $(HOME)/.shrc.d
install-subversion:
mkdir -p -- $(HOME)/.subversion
@@ -577,7 +577,7 @@ install-terminfo:
tic terminfo/screen-256color.ti
install-tidy: install-sh
- cp -p -- tidy/profile.d/* $(HOME)/.profile.d
+ cp -p -- tidy/profile.d/*.sh $(HOME)/.profile.d
mkdir -p -- $(XDG_CONFIG_HOME)/tidy
cp -p -- tidy/tidyrc $(XDG_CONFIG_HOME)/tidy/tidyrc
@@ -621,7 +621,7 @@ install-vint:
cp -p -- vint/vintrc.yaml $(HOME)/.vintrc.yaml
install-wget: install-sh
- cp -p -- wget/profile.d/* $(HOME)/.profile.d
+ cp -p -- wget/profile.d/*.sh $(HOME)/.profile.d
mkdir -p -- $(XDG_CACHE_HOME)/wget $(XDG_CONFIG_HOME)/wget
cp -p -- wget/wgetrc $(XDG_CONFIG_HOME)/wget/wgetrc
@@ -633,16 +633,16 @@ install-x: check-xinit
cp -p -- X/redshift.conf $(XDG_CONFIG_HOME)
cp -p -- X/sxhkdrc $(XDG_CONFIG_HOME)/sxhkd
cp -p -- X/xinitrc $(HOME)/.xinitrc
- cp -p -- X/xinitrc.d/* $(HOME)/.xinitrc.d
+ cp -p -- X/xinitrc.d/*.sh $(HOME)/.xinitrc.d
cp -p -- X/Xresources $(HOME)/.Xresources
- cp -p -- X/Xresources.d/* $(HOME)/.Xresources.d
+ cp -p -- X/Xresources.d/*.sh $(HOME)/.Xresources.d
install-zsh: check-zsh install-sh
mkdir -p -- $(HOME)/.zshrc.d
- cp -p -- zsh/profile.d/* $(HOME)/.profile.d
+ cp -p -- zsh/profile.d/*.sh $(HOME)/.profile.d
cp -p -- zsh/zprofile $(HOME)/.zprofile
cp -p -- zsh/zshrc $(HOME)/.zshrc
- cp -p -- zsh/zshrc.d/* $(HOME)/.zshrc.d
+ cp -p -- zsh/zshrc.d/*.zsh $(HOME)/.zshrc.d
check: check-bin \
check-git-template-hooks \
diff --git a/VERSION b/VERSION
index e0bf6231..34b72f60 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v9.20.0
-Sun, 07 Jun 2020 23:24:44 +0000
+tejr dotfiles v9.21.0
+Wed, 10 Jun 2020 11:06:21 +0000
diff --git a/sh/profile.d/welcome.sh b/sh/profile.d/welcome.sh
index 22cdde93..3cb420c5 100644
--- a/sh/profile.d/welcome.sh
+++ b/sh/profile.d/welcome.sh
@@ -7,14 +7,14 @@ esac
# Only if not in a tmux window
[ -z "$TMUX" ] || return
-# Not if ~/.hushlogin exists
-[ -e "$HOME"/.hushlogin ] && return
+# Only if ~/.hushlogin doesn't exist
+! [ -e "$HOME"/.hushlogin ] || return
# Run all of this in a subshell to clear it away afterwards
(
# Temporary helper function
welcome() {
- [ -e "$HOME"/.welcome/"$1" ] || return
+ [ -e "$HOME"/.config/welcome/"$1" ] || return
command -v "$1" >/dev/null 2>&1 || return
}