summaryrefslogtreecommitdiff
path: root/source/xap/windowmaker/wmaker.inst.diff
diff options
context:
space:
mode:
Diffstat (limited to 'source/xap/windowmaker/wmaker.inst.diff')
-rw-r--r--source/xap/windowmaker/wmaker.inst.diff29
1 files changed, 15 insertions, 14 deletions
diff --git a/source/xap/windowmaker/wmaker.inst.diff b/source/xap/windowmaker/wmaker.inst.diff
index c80edd34..3fdfe643 100644
--- a/source/xap/windowmaker/wmaker.inst.diff
+++ b/source/xap/windowmaker/wmaker.inst.diff
@@ -1,10 +1,12 @@
---- ./util/wmaker.inst.in.orig 2002-05-30 13:13:46.000000000 -0700
-+++ ./util/wmaker.inst.in 2002-05-30 13:16:37.000000000 -0700
-@@ -37,19 +37,7 @@
- make_script() {
- ISCRIPT=$1
+diff -Nur WindowMaker-0.95.2.orig/util/wmaker.inst.in WindowMaker-0.95.2/util/wmaker.inst.in
+--- WindowMaker-0.95.2.orig/util/wmaker.inst.in 2012-02-14 13:36:01.000000000 -0600
++++ WindowMaker-0.95.2/util/wmaker.inst.in 2012-02-14 18:25:28.213206250 -0600
+@@ -33,20 +33,7 @@
-- cat << EOF >> $ISCRIPT
+ make_script() {
+ ISCRIPT="$1"
+-
+- cat << EOF >> "$ISCRIPT"
-# Window Maker default X session startup script
-
-PATH="\$PATH:$BINDIR"
@@ -12,16 +14,16 @@
-# If you login from xdm, uncomment this to make error messages appear
-# in the console window.
-#
--# tail -f $HOME/.xsession-errors > /dev/console &
+-# tail -f "$HOME"/.xsession-errors > /dev/console &
-
-exec wmaker
-
-EOF
-+ cat /etc/X11/xinit/xinitrc.wmaker >> $ISCRIPT
- chmod +rx $ISCRIPT
++ cat /etc/X11/xinit/xinitrc.wmaker >> $ISCRIPT
+ chmod +rx "$ISCRIPT"
}
-@@ -329,20 +317,7 @@
+@@ -298,19 +285,7 @@
trap "show_end_message;exit" 2
@@ -38,8 +40,7 @@
- echo "Using .xinitrc as a default value"
- file=.xinitrc
-fi
--
+file=.xinitrc
- if [ -f $USERDIR/$file ]; then
- mv $USERDIR/$file $USERDIR/$file.old.$DATE
- fi
+
+ if [ -f "$USERDIR/$file" ]; then
+ mv "$USERDIR/$file" "$USERDIR/$file.old.$DATE"