You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
32 lines
1.4 KiB
32 lines
1.4 KiB
commit 62e36ad0410ce888e7097e7bce5cbbf67b5b6290
|
|
Author: Dana Jansens <danakj@orodu.net>
|
|
Date: Tue Jan 12 13:59:25 2010 -0500
|
|
|
|
Fixes bug #4492 (mis-using the return value of grep -q in openbox-gnome-session script
|
|
|
|
diff --git a/data/xsession/openbox-gnome-session.in b/data/xsession/openbox-gnome-session.in
|
|
index 6765ae8..1f17edb 100644
|
|
--- a/data/xsession/openbox-gnome-session.in
|
|
+++ b/data/xsession/openbox-gnome-session.in
|
|
@@ -37,7 +37,7 @@ else
|
|
if test -z "$SESSION"; then
|
|
# if its empty then just run openbox
|
|
SESSION="[openbox]"
|
|
- elif test -z $(echo "$SESSION" | grep -q openbox); then
|
|
+ elif echo "$SESSION" | grep -q openbox; then
|
|
# if openbox isn't in the session then append it
|
|
SESSION="${SESSION%]},openbox]"
|
|
fi
|
|
diff -up openbox-3.4.10/data/xsession/openbox-gnome-session.in.gnomesession2 openbox-3.4.10/data/xsession/openbox-gnome-session.in
|
|
--- openbox-3.4.10/data/xsession/openbox-gnome-session.in.gnomesession2 2010-01-21 14:30:07.000000000 +0100
|
|
+++ openbox-3.4.10/data/xsession/openbox-gnome-session.in 2010-01-21 14:30:47.000000000 +0100
|
|
@@ -37,7 +37,7 @@ else
|
|
if test -z "$SESSION"; then
|
|
# if its empty then just run openbox
|
|
SESSION="[openbox]"
|
|
- elif echo "$SESSION" | grep -q openbox; then
|
|
+ elif ! echo "$SESSION" | grep -q openbox; then
|
|
# if openbox isn't in the session then append it
|
|
SESSION="${SESSION%]},openbox]"
|
|
fi
|