[X2Go-Commits] [x2goserver] 10/33: x2goserver/bin/x2gostartagent: replace perl call with bash pattern substitution.
git-admin at x2go.org
git-admin at x2go.org
Wed Jan 10 00:19:23 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goserver.
commit 254fd5411e318161cbc80cfdfd5d381a2decc622
Author: Mihai Moldovan <ionic at ionic.de>
Date: Tue Jan 2 04:10:22 2018 +0100
x2goserver/bin/x2gostartagent: replace perl call with bash pattern substitution.
Cherry-picked from release/4.0.1.x branch.
---
debian/changelog | 2 ++
x2goserver/bin/x2gostartagent | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 115dee0..b0770d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -291,6 +291,8 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium
that enough processes to overflow the PID + to get to the original PID
value need to be spawned in a very short amount of time. Unlikely, but
not impossible.
+ - x2goserver/bin/x2gostartagent: replace perl call with bash pattern
+ substitution.
* x2goserver.spec:
- RPMify x2goserver-xsession description.
- Remove qt4 stuff, we're not using the framework here.
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index e603939..8e6542b 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -331,7 +331,7 @@ while [ "${OUTPUT}" != "inserted" ]; do
fi
if [ "${COLORDEPTH}" != "" ]; then
SESSION_NAME="${SESSION_NAME}_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH}"
- SESSION_NAME="$(perl -pe "s/:/PP/g" <<< "${SESSION_NAME}")"
+ SESSION_NAME="${SESSION_NAME//:/PP}"
fi
# sanitize session name
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list