[X2Go-Commits] [x2goserver] 06/17: debian/x2goserver.config: more curly braces, quotes etc.
git-admin at x2go.org
git-admin at x2go.org
Fri Nov 16 03:47:04 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 26618f430509b9b1b721c46423cac0493f00b1f3
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Nov 16 03:01:06 2018 +0100
debian/x2goserver.config: more curly braces, quotes etc.
---
debian/changelog | 1 +
debian/x2goserver.config | 24 ++++++++++--------------
2 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6a8d713..18304d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,6 +65,7 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium
+ Replace historical "egrep" with "grep -E".
* debian/x2goserver.config:
+ Replace historical "egrep" with "grep -E".
+ + More curly braces, quotes etc.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Tue, 14 Aug 2018 16:41:40 +0200
diff --git a/debian/x2goserver.config b/debian/x2goserver.config
index ad262bb..72e5bea 100755
--- a/debian/x2goserver.config
+++ b/debian/x2goserver.config
@@ -3,24 +3,20 @@
set -e
# Source debconf library.
-. /usr/share/debconf/confmodule
+. '/usr/share/debconf/confmodule'
-LASTVERSION=$2
+LASTVERSION="${2}"
-if dpkg --compare-versions "$LASTVERSION" lt "3.1.0.0" && \
- [ -e /etc/x2go/x2gosql/sql ] && \
- grep -E "^backend=postgres.*" /etc/x2go/x2gosql/sql >/dev/null; then
-
- db_input critical x2goserver/postgresql-upgrade-3_1_0_0 || true
+if dpkg --compare-versions "${LASTVERSION}" 'lt' '3.1.0.0' && \
+ [ -e '/etc/x2go/x2gosql/sql' ] && \
+ grep -E '^backend=postgres.*' '/etc/x2go/x2gosql/sql' >'/dev/null'; then
+ db_input 'critical' 'x2goserver/postgresql-upgrade-3_1_0_0' || true
db_go
-
fi
-if dpkg --compare-versions "$LASTVERSION" lt "4.1.0.0" && \
- [ -e /etc/x2go/x2gosql/sql ] && \
- grep -E "^backend=postgres.*" /etc/x2go/x2gosql/sql >/dev/null; then
-
- db_input critical x2goserver/upgrade-4_1_0_0 || true
+if dpkg --compare-versions "${LASTVERSION}" 'lt' '4.1.0.0' && \
+ [ -e '/etc/x2go/x2gosql/sql' ] && \
+ grep -E '^backend=postgres.*' '/etc/x2go/x2gosql/sql' >'/dev/null'; then
+ db_input 'critical' 'x2goserver/upgrade-4_1_0_0' || true
db_go
-
fi
--
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