Merge branch 'release/v12.22.0'v12.22.0

* release/v12.22.0:
  Restore correct backgrounding for xsession
  Avoid using wildcards for installing single files
  Correct profile snippet for Rust cargo
  Switch back to separate assignment/export
  Start versioning XFCE4 terminal config
  Correct parcellite X session subfile install
  Reorganize X11 startup file again
  Revert "Refactor X startup to accomodate differ...

1 files changed, 54 insertions, 43 deletions

diff --git a/Makefile b/Makefile
index 16e51e4a..81464d18 100644
--- a/Makefile
+++ b/Makefile
@@ -56,6 +56,8 @@
 	install-vint \
 	install-wget \
 	install-x \
+	install-xfce \
+	install-xsession \
 	install-yt-dlp \
 	install-zsh \
 	check \
@@ -69,6 +71,7 @@
 	check-sh \
 	check-urxvt \
 	check-x \
+	check-xsession \
 	check-zsh \
 	lint \
 	lint-bash \
@@ -79,7 +82,8 @@
 	lint-sh \
 	lint-urxvt \
 	lint-vim \
-	lint-x
+	lint-x \
+	lint-xsession
 
 .SUFFIXES:
 .SUFFIXES: .awk .bash .m4 .mi5 .pl .sed .sh
@@ -405,18 +409,18 @@ install-bin-man:
 	cp -p -- man/man8/*.8df $(XDG_DATA_HOME)/man/man8
 
 install-cabal:
-	cp -p -- cabal/profile.d/*.sh $(HOME)/.profile.d
+	cp -p -- cabal/profile.d/cabal.sh $(HOME)/.profile.d
 
 install-cargo:
-	cp -p -- cargo/profile.d/*.sh $(HOME)/.profile.d
+	cp -p -- cargo/profile.d/cargo.sh $(HOME)/.profile.d
 
 install-cpanm:
-	cp -p -- cpanm/profile.d/*.sh $(HOME)/.profile.d
+	cp -p -- cpanm/profile.d/cpanm.sh $(HOME)/.profile.d
 
 install-curl:
 	cp -p -- curl/curlrc $(HOME)/.curlrc
 
-install-dillo: dillo/dillorc install-x
+install-dillo: dillo/dillorc
 	mkdir -p -- $(HOME)/.dillo
 	cp -p -- dillo/dillorc $(HOME)/.dillo/dillorc
 
@@ -453,18 +457,19 @@ 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/*.sh $(HOME)/.profile.d
+	cp -p -- gnupg/profile.d/gnupg.sh $(HOME)/.profile.d
 
 install-i3: install-x
 	mkdir -p -- $(XDG_CONFIG_HOME)/i3
-	cp -p -- i3/* $(XDG_CONFIG_HOME)/i3
+	cp -p -- i3/config $(XDG_CONFIG_HOME)/i3
+	cp -p -- i3/status $(XDG_CONFIG_HOME)/i3
 
 install-init:
 	if test -d /run/systemd/system ; then make install-systemd ; fi
 
 install-less: less/less
 	mkdir -p -- $(HOME)/.profile.d
-	cp -p -- less/profile.d/*.sh $(HOME)/.profile.d
+	cp -p -- less/profile.d/less.sh $(HOME)/.profile.d
 	mkdir -p -- $(XDG_CONFIG_HOME)/less
 	cp -p -- less/less $(XDG_CONFIG_HOME)/less/key
 
@@ -487,7 +492,7 @@ install-mpv:
 	mkdir -p -- \
 		$(XDG_CONFIG_HOME)/mpv \
 		$(XDG_DATA_HOME)/mpv/screenshots
-	cp -p -- mpv/* $(XDG_CONFIG_HOME)/mpv
+	cp -p -- mpv/mpv.conf $(XDG_CONFIG_HOME)/mpv
 
 install-mutt: install-gnupg install-mail mutt/filters/markdown-to-html
 	mkdir -p -- \
@@ -522,7 +527,7 @@ install-mysql:
 
 install-ksh: check-ksh install-sh
 	mkdir -p -- $(HOME)/.kshrc.d
-	cp -p -- ksh/shrc.d/*.sh $(HOME)/.shrc.d
+	cp -p -- ksh/shrc.d/ksh.sh $(HOME)/.shrc.d
 	cp -p -- ksh/kshrc $(HOME)/.kshrc
 	cp -p -- ksh/kshrc.d/*.ksh $(HOME)/.kshrc.d
 
@@ -531,39 +536,39 @@ install-login-shell: check-login-shell
 
 install-parcellite: install-x
 	cp -p -- parcellite/parcelliterc $(XDG_CONFIG_HOME)
-	cp -p -- redshift/xsession.d/* $(HOME)/.xsession.d
+	cp -p -- parcellite/xsession.d/parcellite.sh $(HOME)/.xsession.d
 
 install-perlcritic: install-sh
-	cp -p -- perlcritic/profile.d/*.sh $(HOME)/.profile.d
+	cp -p -- perlcritic/profile.d/perlcritic.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/*.sh $(HOME)/.profile.d
+	cp -p -- perltidy/profile.d/perltidy.sh $(HOME)/.profile.d
 	mkdir -p -- $(XDG_CONFIG_HOME)/perltidy
 	cp -p -- perltidy/perltidyrc $(XDG_CONFIG_HOME)/perltidy/perltidyrc
 
 install-plenv: install-sh install-cpanm
-	cp -p -- plenv/profile.d/*.sh $(HOME)/.profile.d
-	cp -p -- plenv/shrc.d/*.sh $(HOME)/.shrc.d
+	cp -p -- plenv/profile.d/plenv.sh $(HOME)/.profile.d
+	cp -p -- plenv/shrc.d/plenv.sh $(HOME)/.shrc.d
 
 install-psql:
 	cp -p -- psql/psqlrc $(HOME)/.psqlrc
 
 install-pyenv: install-sh
-	cp -p -- pyenv/profile.d/*.sh $(HOME)/.profile.d
-	cp -p -- pyenv/shrc.d/*.sh $(HOME)/.shrc.d
+	cp -p -- pyenv/profile.d/pyenv.sh $(HOME)/.profile.d
+	cp -p -- pyenv/shrc.d/pyenv.sh $(HOME)/.shrc.d
 
 install-rbenv: install-sh
-	cp -p -- rbenv/profile.d/*.sh $(HOME)/.profile.d
-	cp -p -- rbenv/shrc.d/*.sh $(HOME)/.shrc.d
+	cp -p -- rbenv/profile.d/rbenv.sh $(HOME)/.profile.d
+	cp -p -- rbenv/shrc.d/rbenv.sh $(HOME)/.shrc.d
 
 install-readline:
 	cp -p -- readline/inputrc $(HOME)/.inputrc
 
 install-redshift: install-x
 	cp -p -- redshift/redshift.conf $(XDG_CONFIG_HOME)
-	cp -p -- redshift/xsession.d/* $(HOME)/.xsession.d
+	cp -p -- redshift/xsession.d/redshift.sh $(HOME)/.xsession.d
 
 install-scrot:
 	mkdir -p -- $(XDG_DATA_HOME)/scrot/screenshots
@@ -583,21 +588,21 @@ install-subversion:
 install-sxhkd: install-scrot install-x
 	mkdir -p -- $(XDG_CONFIG_HOME)/sxhkd
 	cp -p -- sxhkd/sxhkdrc $(XDG_CONFIG_HOME)/sxhkd
-	cp -p -- sxhkd/xsession.d/* $(HOME)/.xsession.d
+	cp -p -- sxhkd/xsession.d/sxhkd.sh $(HOME)/.xsession.d
 
 install-systemd: install-sh
-	cp -p -- systemd/profile.d/*.sh $(HOME)/.profile.d
+	cp -p -- systemd/profile.d/systemd.sh $(HOME)/.profile.d
 	mkdir -p -- $(XDG_DATA_HOME)/systemd/user
-	cp -p -- systemd/user/*.service \
+	cp -p -- systemd/user/notify-email@.service \
 		$(XDG_DATA_HOME)/systemd/user
 	mkdir -p -- $(XDG_DATA_HOME)/systemd/user/service.d
-	cp -p -- systemd/user/service.d/*.conf \
+	cp -p -- systemd/user/service.d/50-notify-email.conf \
 		$(XDG_DATA_HOME)/systemd/user/service.d
 	mkdir -p -- $(XDG_DATA_HOME)/systemd/user/notify-email@.service.d
-	cp -p -- systemd/user/notify-email@.service.d/*.conf \
+	cp -p -- systemd/user/notify-email@.service.d/50-notify-email.conf \
 		$(XDG_DATA_HOME)/systemd/user/notify-email@.service.d
 	mkdir -p -- $(XDG_DATA_HOME)/systemd/user/run-.service.d
-	cp -p -- systemd/user/run-.service.d/*.conf \
+	cp -p -- systemd/user/run-.service.d/50-notify-email.conf \
 		$(XDG_DATA_HOME)/systemd/user/run-.service.d
 
 # Need to install these in appropriate order to meet dependencies; could trust
@@ -613,7 +618,7 @@ install-terminfo:
 	tic terminfo/screen-256color.ti
 
 install-tidy: install-sh
-	cp -p -- tidy/profile.d/*.sh $(HOME)/.profile.d
+	cp -p -- tidy/profile.d/tidy.sh $(HOME)/.profile.d
 	mkdir -p -- $(XDG_CONFIG_HOME)/tidy
 	cp -p -- tidy/tidyrc $(XDG_CONFIG_HOME)/tidy/tidyrc
 
@@ -627,8 +632,7 @@ install-tmux: tmux/bin/tmux tmux/tmux.conf install-systemd install-terminfo
 install-urxvt: urxvt/ext/select install-x
 	mkdir -p -- $(HOME)/.urxvt/ext
 	cp -p -- urxvt/ext/select $(HOME)/.urxvt/ext
-	cp -p -- urxvt/Xresources.d/* $(HOME)/.Xresources.d
-	cp -p -- urxvt/xsession.d/* $(HOME)/.xsession.d
+	cp -p -- urxvt/xsession.d/urxvt.sh $(HOME)/.xsession.d
 
 VIM = vim
 VIMDIR = $(HOME)/.vim
@@ -663,22 +667,23 @@ install-vint:
 	cp -p -- vint/vintrc.yaml $(HOME)/.vintrc.yaml
 
 install-wget: install-sh
-	cp -p -- wget/profile.d/*.sh $(HOME)/.profile.d
+	cp -p -- wget/profile.d/wget.sh $(HOME)/.profile.d
 	mkdir -p -- $(XDG_CACHE_HOME)/wget $(XDG_CONFIG_HOME)/wget
 	cp -p -- wget/wgetrc $(XDG_CONFIG_HOME)/wget/wgetrc
 
-install-x: x/xsession check-x install-logrotate install-sh
-	mkdir -p -- \
-		$(HOME)/.xsession.d \
-		$(HOME)/.Xresources.d \
-		$(XDG_CONFIG_HOME)/log/xsession
-	cp -p -- x/xprofile $(HOME)/.xprofile
-	cp -p -- x/xsession $(HOME)/.xsession
-	cp -p -- x/xsessionrc $(HOME)/.xsessionrc
+install-x: check-x install-logrotate install-sh
 	cp -p -- x/Xresources $(HOME)/.Xresources
-	cp -p -- x/Xresources.d/* $(HOME)/.Xresources.d
-	cp -p -- x/logrotate/config.d/* $(XDG_CONFIG_HOME)/logrotate/config.d
-	cp -p -- x/shrc.d/*.sh $(HOME)/.shrc.d
+	mkdir -p -- $(HOME)/.xsession.d
+	cp -p -- x/shrc.d/x.sh $(HOME)/.shrc.d
+	mkdir -p -- $(XDG_CONFIG_HOME)/log/xsession
+	cp -p -- x/logrotate/config.d/xsession $(XDG_CONFIG_HOME)/logrotate/config.d
+
+install-xfce: install-x
+	mkdir -p $(XDG_CONFIG_HOME)/xfce4/terminal
+	cp -p -- xfce/terminalrc $(XDG_CONFIG_HOME)/xfce4/terminal/
+
+install-xsession: x/xsession check-xsession install-x
+	cp -p -- x/xsession $(HOME)/.xsession
 
 install-yt-dlp install-youtube-dl:
 	mkdir -p -- $(XDG_CONFIG_HOME)/yt-dlp
@@ -686,7 +691,7 @@ install-yt-dlp install-youtube-dl:
 
 install-zsh: check-zsh install-sh
 	mkdir -p -- $(HOME)/.zshrc.d
-	cp -p -- zsh/profile.d/*.sh $(HOME)/.profile.d
+	cp -p -- zsh/profile.d/zsh.sh $(HOME)/.profile.d
 	cp -p -- zsh/zprofile $(HOME)/.zprofile
 	cp -p -- zsh/zshrc $(HOME)/.zshrc
 	cp -p -- zsh/zshrc.d/*.zsh $(HOME)/.zshrc.d
@@ -724,9 +729,12 @@ check-sh:
 check-urxvt: urxvt/ext/select
 	sh check/urxvt.sh
 
-check-x: x/xsession
+check-x:
 	sh check/x.sh
 
+check-xsession: x/xsession
+	sh check/xsession.sh
+
 check-zsh:
 	sh check/zsh.sh
 
@@ -766,3 +774,6 @@ lint-vim:
 
 lint-x: check-x
 	sh lint/x.sh
+
+lint-xsession: x/xsession check-xsession
+	sh lint/xsession.sh