Skip to content

Commit

Permalink
wmaker.inst: remove all modification to ~/.xinitrc
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
John D Pell authored and crmafra committed Aug 10, 2021
1 parent a0b283a commit dce34e9
Showing 1 changed file with 0 additions and 40 deletions.
40 changes: 0 additions & 40 deletions util/wmaker.inst.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down Expand Up @@ -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

0 comments on commit dce34e9

Please sign in to comment.