summaryrefslogtreecommitdiffstats
path: root/desktop/fvwm95/xinitrc.fvwm95
diff options
context:
space:
mode:
author Logan Rathbone2020-05-30 03:03:17 +0200
committer Willy Sudiarto Raharjo2020-06-01 03:46:33 +0200
commit159a356f214d3c5e2c074c6e982e2bfe199b2657 (patch)
tree8415a303b923ca290b29382e84cc6847f020daf1 /desktop/fvwm95/xinitrc.fvwm95
parentb5d424006b6658f159ff8d73fef75a9d5d3b02c0 (diff)
downloadslackbuilds-159a356f214d3c5e2c074c6e982e2bfe199b2657.tar.gz
desktop/fvwm95: Updated for version 2.0.43f.
Signed-off-by: Dave Woodfall <dave@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'desktop/fvwm95/xinitrc.fvwm95')
-rw-r--r--desktop/fvwm95/xinitrc.fvwm9523
1 files changed, 16 insertions, 7 deletions
diff --git a/desktop/fvwm95/xinitrc.fvwm95 b/desktop/fvwm95/xinitrc.fvwm95
index b08bba4339..17a7670ee6 100644
--- a/desktop/fvwm95/xinitrc.fvwm95
+++ b/desktop/fvwm95/xinitrc.fvwm95
@@ -1,29 +1,38 @@
#!/bin/sh
-# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+
+# Slackware FVWM95 xinitrc script
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
sysresources=/etc/X11/xinit/.Xresources
sysmodmap=/etc/X11/xinit/.Xmodmap
+# Uncomment this if you would like fvwm95 to launch in a dbus session.
+#dbus_cmd="dbus-launch --exit-with-session"
+
# merge in defaults and keymaps
if [ -f $sysresources ]; then
- /usr/bin/xrdb -merge $sysresources
+ xrdb -merge $sysresources
fi
if [ -f $sysmodmap ]; then
- /usr/bin/xmodmap $sysmodmap
+ xmodmap $sysmodmap
fi
if [ -f $userresources ]; then
- /usr/bin/xrdb -merge $userresources
+ xrdb -merge $userresources
fi
if [ -f $usermodmap ]; then
- /usr/bin/xmodmap $usermodmap
+ xmodmap $usermodmap
fi
-# start some nice programs
+# start fvwm95
+
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+ ck-launch-session $dbus_cmd /usr/bin/fvwm95
+else
+ $dbus_cmd /usr/bin/fvwm95
+fi
-exec /usr/bin/fvwm95