From dce34e926bd84130ddf52e19d949a37adc266f24 Mon Sep 17 00:00:00 2001
From: John D Pell <john@pell.cc>
Date: Sun, 8 Aug 2021 09:36:29 +0200
Subject: [PATCH] wmaker.inst: remove all modification to ~/.xinitrc

I cannot imagine that modifying an existing ~/.xinitrc is ever wanted, and creating an ~/.xinitrc when none exists is much worse.

If a user created their own ~/.xinitrc, then don't modify it.
The user will modify it if they like.

If the user did not create their own ~/.xinitrc, then creating one will short-circuit X startup as `startx` will *replace* the system's version with the user's version.
Literally ~/.Xresources won't be loaded.
There's no way this is expected behavior.
---
 util/wmaker.inst.in | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/util/wmaker.inst.in b/util/wmaker.inst.in
index 646f1ee5..cee8c0dc 100644
--- a/util/wmaker.inst.in
+++ b/util/wmaker.inst.in
@@ -31,26 +31,6 @@ make_dir() {
 	chmod +rwx "$1"
 }
 
-make_script() {
-	ISCRIPT="$1"
-
-	cat << EOF >> "$ISCRIPT"
-# Window Maker default X session startup script
-
-PATH="\$PATH:$BINDIR"
-
-# If you login from xdm, uncomment this to make error messages appear
-# in the console window.
-#
-# tail -f "$HOME"/.xsession-errors > /dev/console &
-
-exec wmaker
-
-EOF
-	chmod +rx "$ISCRIPT"
-}
-
-
 #
 # Copy files considering special cases
 #
@@ -293,24 +273,4 @@ fi
 
 trap "show_end_message;exit" 2
 
-echo
-echo "Now the .xinitrc, .Xclients or .xsession script must be updated so that"
-echo "it calls wmaker when you start an X session."
-echo "Type the name of the file that must be changed (normally .xinitrc)."
-echo "If the file already exists, it will be backed up with a .old.$DATE "
-echo "extension"
-echo "If you want to edit it by hand, hit <Control>-C now."
-read file
-
-if test "x$file" = "x"; then
-	echo "Using .xinitrc as a default value"
-	file=.xinitrc
-fi
-
-if [ -f "$USERDIR/$file" ]; then
-	mv "$USERDIR/$file" "$USERDIR/$file.old.$DATE"
-fi
-
-make_script "$USERDIR/$file"
-
 show_end_message