summaryrefslogtreecommitdiffstats
path: root/source/x/x11-skel/scripts
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2012-09-26 01:10:42 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 22:51:55 +0200
commit9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch)
treeb428a16618e36ed864a8d76ea3435e19a452bf90 /source/x/x11-skel/scripts
parent75a4a592e5ccda30715f93563d741b83e0dcf39e (diff)
downloadcurrent-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz
current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.xz
Slackware 14.0slackware-14.0
Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-)
Diffstat (limited to 'source/x/x11-skel/scripts')
-rw-r--r--source/x/x11-skel/scripts/xwmconfig12
1 files changed, 9 insertions, 3 deletions
diff --git a/source/x/x11-skel/scripts/xwmconfig b/source/x/x11-skel/scripts/xwmconfig
index 944207bf5..724242ab8 100644
--- a/source/x/x11-skel/scripts/xwmconfig
+++ b/source/x/x11-skel/scripts/xwmconfig
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright 1999, 2002 Patrick Volkerding, Moorhead, Minnesota USA
+# Copyright 1999, 2002, 2012 Patrick Volkerding, Moorhead, Minnesota USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -50,7 +50,7 @@ fi
if [ "$USER" = "root" ]; then
BACKTITLE="--backtitle \"Setting system-wide default window manager in /etc/X11/xinit/\""
else
- BACKTITLE="--backtitle \"Setting default window manager in $HOME/.xinitrc\""
+ BACKTITLE="--backtitle \"Setting default window manager in $HOME/.xinitrc and $HOME/.xsession\""
fi
# This stops --backtitle from cluttering the initial install:
@@ -211,13 +211,19 @@ if [ "$USER" = "root" ]; then
fi
fi
-# Also set up a new $HOME/.xinitrc:
+# Also set up a new $HOME/.xinitrc and $HOME/.xinitrc:
if [ -r /etc/X11/xinit/$OUTPUT -a ! "$HOME" = "/" ]; then
if [ -r $HOME/.xinitrc ]; then
rm -f $HOME/.xinitrc-backup
mv $HOME/.xinitrc $HOME/.xinitrc-backup
fi
cat /etc/X11/xinit/$OUTPUT > $HOME/.xinitrc
+ if [ -r $HOME/.xsession ]; then
+ rm -f $HOME/.xsession-backup
+ mv $HOME/.xsession $HOME/.xsession-backup
+ fi
+ cat /etc/X11/xinit/$OUTPUT > $HOME/.xsession
+ chmod 755 $HOME/.xsession
fi
rm -f $TMP/tmpscript.sh $TMP/output