[X2Go-Commits] [live-build-x2go] 31/60: chromium needs multiple URLs separated by comma, rather than pipe, and all enclosed in double quotes

[git-admin at x2go.org]

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

x2go pushed a commit to branch feature/mate-minidesktop-buster
in repository live-build-x2go.

commit 263262339591cb49a53df7dd0fb8418470e7e692
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Mon Jun 22 23:07:24 2020 +0200

    chromium needs multiple URLs separated by comma, rather than pipe, and
    all enclosed in double quotes
---
 config/includes.chroot/lib/live/config/2900-chromium-config | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2900-chromium-config b/config/includes.chroot/lib/live/config/2900-chromium-config
index f703084..34447b7 100755
--- a/config/includes.chroot/lib/live/config/2900-chromium-config
+++ b/config/includes.chroot/lib/live/config/2900-chromium-config
@@ -15,7 +15,7 @@ ChromiumConfig ()
 	if [ -z "$HOMEPAGEURL" ] ; then 
 		HOMEPAGEURL='http://www.x2go.org/'
 	else
-		HOMEPAGEURL=$(echo -e "$(urldecode "$HOMEPAGEURL")")
+		HOMEPAGEURL=$(echo -e '"'"$(urldecode "$HOMEPAGEURL")"'"' | sed -e 's#|#","#g')
 	fi
 	mkdir -p /etc/chromium/policies/managed
 	cat >/etc/chromium/policies/managed/chromium.json <<CHROMIUMCONFIG
@@ -31,7 +31,7 @@ ChromiumConfig ()
  "DownloadDirectory": "/home/\${user_name}/Downloads",
  "EditBookmarksEnabled": false,
  "HomepageIsNewTabPage": false,
- "HomepageLocation": "$HOMEPAGEURL",
+ "HomepageLocation": $HOMEPAGEURL,
  "ImportBookmarks": false,
  "ImportHistory": false,
  "ImportHomepage": false,
@@ -45,7 +45,7 @@ ChromiumConfig ()
  //   5 = Open New Tab Page
  //   1 = Restore the last session
  //   4 = Open a list of URLs
- "RestoreOnStartupURLs": ["$HOMEPAGEURL"],
+ "RestoreOnStartupURLs": [$HOMEPAGEURL],
  "ShowHomeButton": true,
  "SyncDisabled": true,
  "TranslateEnabled": false,

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