[X2Go-Commits] [x2gokdrive] 14/28: debian/rules: split up subshell content onto unique lines and fix bash syntax error near "exit 1".
git-admin at x2go.org
git-admin at x2go.org
Sat Oct 26 23:00:31 CEST 2019
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gokdrive.
commit 124b043d8ddd8792cb083058ecc0bd8a420acaf1
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Oct 24 23:08:11 2019 +0200
debian/rules: split up subshell content onto unique lines and fix bash syntax error near "exit 1".
---
debian/changelog | 2 ++
debian/rules | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 5d19d29..1b10c70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,5 +25,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
+ "a && b || c" doesn't really mean "if a then b else c", but something...
more difficult: "c" does also run if "a" is false. Switch to a proper
if-else construct.
+ + Split up subshell content onto unique lines and fix bash syntax error
+ near "exit 1".
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Tue, 04 Jun 2019 14:10:43 +0200
diff --git a/debian/rules b/debian/rules
index 6624cbe..bd953da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,11 @@ override_dh_auto_configure:
if [ -d ../../patches.xorg/$$XORG_UPSTREAM_VERSION ]; then \
QUILT_PATCHES=../../patches.xorg/$${XORG_UPSTREAM_VERSION}/ quilt push -a; \
else \
- ( set +x; echo "\n##################################################\nERROR: This X2Go KDrive version does not support\nbuilding against X.Org version $$XORG_UPSTREAM_VERSION.\n##################################################\n"; exit 1); \
+ ( \
+ set +x; \
+ echo "\n##################################################\nERROR: This X2Go KDrive version does not support\nbuilding against X.Org version $$XORG_UPSTREAM_VERSION.\n##################################################\n"; \
+ exit 1; \
+ ); \
fi
# run autoreconf
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
More information about the x2go-commits
mailing list