summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy C. Reed <reed@reedmedia.net>2006-02-25 15:20:06 +0000
committerJeremy C. Reed <reed@reedmedia.net>2006-02-25 15:20:06 +0000
commitbbf54921031f679c0d266a6b2ef4926f872d18f1 (patch)
treefb873fb5928e4488b146e06c051a1f78f9be1177
parent6690352bdd01603a5e82e177aab4804d5424b8b1 (diff)
Bug #4449 <https://bugs.freedesktop.org/show_bug.cgi?id=4449> Be moreXORG-7_0_99_901
portable (for different /bin/sh shells) for the arithmetic. NetBSD's /bin/sh didn't like: dummy=$((dummy+1)) and complained: startx: arith: syntax error: "dummy+1" This was fixed by NetBSD and also by Gentoo, see: https://launchpad.net/distros/ubuntu/+source/xinit/+bug/31241
-rw-r--r--ChangeLog7
-rw-r--r--startx.cpp2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6492c16..3cca27a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-25 Jeremy C. Reed <reed@reedmedia.net>
+
+ * startx.cpp:
+ Bug #4449 <https://bugs.freedesktop.org/show_bug.cgi?id=4449>
+ Be more portable (for different /bin/sh shells) for
+ the arithmetic.
+
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/startx.cpp b/startx.cpp
index a1e0118..7a6dfab 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -208,7 +208,7 @@ add $displayname . $mcookie
EOF
removelist="$displayname $removelist"
else
- dummy=$((dummy+1));
+ dummy=$(($dummy+1));
XAUTH -q -f $xserverauthfile << EOF
add :$dummy . $authcookie
EOF