[X2Go-Commits] [x2goserver] 44/99: x2goserver/lib/x2goupdateoptionsstring: add options terminators to example calls.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 9c38945e86d5f44ccd4f4845d8c6bc6f0deab63e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Nov 10 07:56:21 2020 +0100

    x2goserver/lib/x2goupdateoptionsstring: add options terminators to example calls.
---
 debian/changelog                       |  2 ++
 x2goserver/bin/x2goupdateoptionsstring | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f917c5e6..bc041346 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -271,6 +271,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
       transformations.
     - x2goserver/lib/x2goupdateoptionsstring: document how to cheat and just
       compact options strings.
+    - x2goserver/lib/x2goupdateoptionsstring: add options terminators to
+      example calls.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
   * debian/x2goserver.manpages:
diff --git a/x2goserver/bin/x2goupdateoptionsstring b/x2goserver/bin/x2goupdateoptionsstring
index cb6ef453..52b9bc43 100755
--- a/x2goserver/bin/x2goupdateoptionsstring
+++ b/x2goserver/bin/x2goupdateoptionsstring
@@ -409,23 +409,23 @@ For an options string such as
 
 =over 2
 
-calling C<x2goupdateoptionsstring 'nx/nx,clipboard=both,foo:50'
+calling C<x2goupdateoptionsstring '--' 'nx/nx,clipboard=both,foo:50'
 '-clipboard'> shall return
 
  nx/nx,foo:50
 
-while calling C<x2goupdateoptionsstring 'nx/nx,clipboard=both,foo:50'
+while calling C<x2goupdateoptionsstring '--' 'nx/nx,clipboard=both,foo:50'
 '-clipboard=server'> shall return
 
  nx/nx,clipboard=both,foo:50
 
-Calling C<x2goupdateoptionsstring 'nx/nx,clipboard=both,foo:50' 'bar'> shall
-return
+Calling C<x2goupdateoptionsstring '--' 'nx/nx,clipboard=both,foo:50' 'bar'>
+shall return
 
  nx/nx,clipboard=both,foo,bar:50
 
-and calling C<x2goupdateoptionsstring 'nx/nx,clipboard=both,foo:50' '+-bar'
-'foo=gulp' '-clipboard=client'> shall return
+and calling C<x2goupdateoptionsstring '--' 'nx/nx,clipboard=both,foo:50'
+'+-bar' 'foo=gulp' '-clipboard=client'> shall return
 
  nx/nx,clipboard=both,foo=gulp,-bar:50
 
@@ -439,7 +439,7 @@ For an options string such as
 
 you can get a compacted version by cheating a bit and providing a
 transformation which will certainly be a no-operation using
-C<x2goupdateoptionsstring '-c'
+C<x2goupdateoptionsstring '-c' '--'
 'nx/nx,clipboard=both,foo=bar,bar=baz,,foo=oof,:50' '-'>, which shall return
 
  nx/nx,clipboard=both,foo=oof,bar=baz:50

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git