mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-18 12:00:31 +01:00
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.
This commit is contained in:
committed by
Carlos R. Mafra
parent
a0b283a60f
commit
dce34e926b
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user