[X2Go-Commits] [x2gokdrive] 17/28: debian/rules: more and better quoting.

[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 x2gokdrive.

commit 6807c24394446b2ed07facf95092b95481fff3ed
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Oct 24 23:27:41 2019 +0200

    debian/rules: more and better quoting.
---
 debian/changelog |  1 +
 debian/rules     | 33 +++++++++++++++++----------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 74a1c42..361c362 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,5 +31,6 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
       sequences for their plain char counterparts and the -e switch is
       non-portable.
     + Avoid xargs, use find's -exec feature.
+    + More and better quoting.
 
  -- 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 48c9e08..dbd988e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,51 +16,52 @@ include debian/rules.flags
 
 override_dh_auto_configure:
 	# prepare xorg-server build tree
-	mkdir -p $(CURDIR)/BUILD
-	cd $(CURDIR)/BUILD && tar -xvf /usr/src/xorg-server.tar.xz
-	mkdir -p $(CURDIR)/BUILD/xorg-server/hw/kdrive/x2gokdrive/
+	mkdir -p '$(CURDIR)/BUILD'
+	cd '$(CURDIR)/BUILD' && tar -xvf '/usr/src/xorg-server.tar.xz'
+	mkdir -p '$(CURDIR)/BUILD/xorg-server/hw/kdrive/x2gokdrive/'
 
 	# inject x2gokdrive into xorg-server build tree
-	cp Makefile.am *.c *.h $(CURDIR)/BUILD/xorg-server/hw/kdrive/x2gokdrive/
-	cp -r $(CURDIR)/man/ BUILD/xorg-server/hw/kdrive/x2gokdrive/
+	cp 'Makefile.am' *'.c' *'.h' '$(CURDIR)/BUILD/xorg-server/hw/kdrive/x2gokdrive/'
+	cp -r '$(CURDIR)/man/ BUILD/xorg-server/hw/kdrive/x2gokdrive/'
 
 	# patch xorg-server build tree, so that it will build x2gokdrive
-	set -x; export XORG_UPSTREAM_VERSION=$$(grep AC_INIT $(CURDIR)/BUILD/xorg-server/configure.ac | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/') \
-	        && cd $(CURDIR)/BUILD/xorg-server \
-		if [ -d  ../../patches.xorg/$$XORG_UPSTREAM_VERSION ]; then \
-			QUILT_PATCHES=../../patches.xorg/$${XORG_UPSTREAM_VERSION}/ quilt push -a; \
+	set -x; \
+		export XORG_UPSTREAM_VERSION="$$(grep AC_INIT '$(CURDIR)/BUILD/xorg-server/configure.ac' | sed -r 's/^AC_INIT[^,]*, ([^,]+),.*/\\1/')" && \
+		cd '$(CURDIR)/BUILD/xorg-server' && \
+		if [ -d  "../../patches.xorg/$${XORG_UPSTREAM_VERSION}" ]; then \
+			QUILT_PATCHES="../../patches.xorg/$${XORG_UPSTREAM_VERSION}/" quilt push -a; \
 		else \
 			( \
 				set +x; \
 				printf '\n##################################################\nERROR: This X2Go KDrive version does not support\nbuilding against X.Org version %s.\n##################################################\n' "$${XORG_UPSTREAM_VERSION}"; \
-				exit 1; \
+				exit '1'; \
 			); \
 		fi
 
 	# run autoreconf
-	cd $(CURDIR)/BUILD/xorg-server && autoreconf -vfi
+	cd '$(CURDIR)/BUILD/xorg-server' && autoreconf -fvi
 
 	# run configure
-	dh_auto_configure --builddirectory=BUILD/xorg-server/ --sourcedirectory=BUILD/xorg-server/ -- \
+	dh_auto_configure --builddirectory='BUILD/xorg-server/' --sourcedirectory='BUILD/xorg-server/' -- \
 	    $(confflags) \
 	    $(confflags_main) \
 	    $(vars)
 
 override_dh_auto_build:
-	dh_auto_build --builddirectory=BUILD/xorg-server/ --sourcedirectory=BUILD/xorg-server/ 
+	dh_auto_build --builddirectory='BUILD/xorg-server/' --sourcedirectory='BUILD/xorg-server/'
 
 override_dh_auto_test:
 	# disabled, nothing to test for x2gokdrive...
 
 override_dh_auto_install:
-	dh_auto_install --builddirectory=BUILD/xorg-server/ --destdir=debian/tmp/
+	dh_auto_install --builddirectory='BUILD/xorg-server/' --destdir='debian/tmp/'
 
 	# oh, yuck.
-	find $(CURDIR)/debian/tmp/usr/lib/xorg -type f -name '*.la' -exec rm -f '{}' ';'
+	find '$(CURDIR)/debian/tmp/usr/lib/xorg' -type 'f' -name '*.la' -exec rm -f '{}' ';'
 
 override_dh_auto_clean:
 	-dh_auto_clean
 
 override_dh_clean:
 	-dh_clean
-	rm -Rf $(CURDIR)/BUILD/
+	rm -Rf '$(CURDIR)/BUILD/'

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