Allow quotes in SHELLINABOX_ARGS (for Debian packages)

diff --git a/config.h b/config.h
index 5fc2644411f7526ec57d8ffd5f307d137afa9f5f..5f836df236a7e508d22d653faebb8d9350a6eda1 100644 (file)
--- a/config.h
+++ b/config.h
@@ -138,7 +138,7 @@
 #define STDC_HEADERS 1
 
 /* Most recent revision number in the version control system */
-#define VCS_REVISION "167"
+#define VCS_REVISION "168"
 
 /* Version number of package */
 #define VERSION "2.9"

diff --git a/configure b/configure
index 2965c7f917bf27ce85658de56a6a5f8cf8b61d36..86ab553668c5c6d751576c4707e3f4b67f81b174 100755 (executable)
--- a/configure
+++ b/configure
@@ -2317,7 +2317,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-VCS_REVISION=167
+VCS_REVISION=168
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.ac b/configure.ac
index e0317169c427eb79dbe4e189aa272850d80b01d1..b94a5e7720b81b8ae2c457aa4e38bc7cb7f775f1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.57)
 
 dnl This is the one location where the authoritative version number is stored
 AC_INIT(shellinabox, 2.9, markus@shellinabox.com)
-VCS_REVISION=167
+VCS_REVISION=168
 AC_SUBST(VCS_REVISION)
 AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
                    [Most recent revision number in the version control system])

diff --git a/debian/shellinabox.init b/debian/shellinabox.init
index 2c751c2fb18c0b737c589ddc0b1f97ecda184044..4b7eaa5e7044423b6562e3615b0aaec600dc9f87 100755 (executable)
--- a/debian/shellinabox.init
+++ b/debian/shellinabox.init
@@ -40,11 +40,11 @@ d_start() {
     return 0
   fi
 
-  start-stop-daemon --start --oknodo --pidfile "$PIDFILE"                     \
-                    --exec "$DAEMON" -- -q --background="$PIDFILE"            \
-                    -c "${SHELLINABOX_DATADIR}" -p "${SHELLINABOX_PORT}"      \
-                    -u "${SHELLINABOX_USER}" -g "${SHELLINABOX_GROUP}"        \
-                    ${SHELLINABOX_ARGS}
+  eval start-stop-daemon --start --oknodo --pidfile "'$PIDFILE'"              \
+                    --exec "'$DAEMON'" -- -q --background="'$PIDFILE'"        \
+                    -c "'${SHELLINABOX_DATADIR}'" -p "'${SHELLINABOX_PORT}'"  \
+                    -u "'${SHELLINABOX_USER}'" -g "'${SHELLINABOX_GROUP}'"    \
+                    "${SHELLINABOX_ARGS}"
 }
 
 #

diff --git a/demo/vt100.js b/demo/vt100.js
index 96fcc2b66529668d42befe79c6e59cc6bb4a866a..64dd2c17c479ea0b67c0209b2616d5a4413206bf 100644 (file)
--- a/demo/vt100.js
+++ b/demo/vt100.js
@@ -1829,7 +1829,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.9 (revision 167)" +
+  alert("VT100 Terminal Emulator " + "2.9 (revision 168)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };

diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js
index a6cb7253c69772db36f209cb95394f1f7c6b79ad..34686951bb6fe60c415003f2c51374dbf2a3111b 100644 (file)
--- a/shellinabox/shell_in_a_box.js
+++ b/shellinabox/shell_in_a_box.js
@@ -355,7 +355,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
 };
 
 ShellInABox.prototype.about = function() {
-  alert("Shell In A Box version " + "2.9 (revision 167)" +
+  alert("Shell In A Box version " + "2.9 (revision 168)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com" +
         (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js
index 96fcc2b66529668d42befe79c6e59cc6bb4a866a..64dd2c17c479ea0b67c0209b2616d5a4413206bf 100644 (file)
--- a/shellinabox/vt100.js
+++ b/shellinabox/vt100.js
@@ -1829,7 +1829,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.9 (revision 167)" +
+  alert("VT100 Terminal Emulator " + "2.9 (revision 168)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };