build: "make deb" failed when the base path contained spaces

With these changes, all the commands triggered by "make deb" use proper quoting
and succeed even when invoked from a directory containing spaces.

contrib/builddeb

@@ -1,104 +1,104 b''
 #!/bin/sh -e
 #
 # Build a Mercurial debian package from the current repo
 #
 # Tested on Jessie (stable as of original script authoring.)
 
 . $(dirname $0)/packagelib.sh
 
 BUILD=1
 CLEANUP=1
 DISTID=`(lsb_release -is 2> /dev/null | tr '[:upper:]' '[:lower:]') || echo debian`
 CODENAME=`lsb_release -cs 2> /dev/null || echo unknown`
 DEBFLAGS=-b
 while [ "$1" ]; do
     case "$1" in
     --distid )
         shift
         DISTID="$1"
         shift
         ;;
     --codename )
         shift
         CODENAME="$1"
         shift
         ;;
     --cleanup )
         shift
         BUILD=
         ;;
     --build )
         shift
         CLEANUP=
         ;;
     --source-only )
         shift
         DEBFLAGS=-S
         ;;
     * )
         echo "Invalid parameter $1!" 1>&2
         exit 1
         ;;
     esac
 done
 
 trap "if [ '$CLEANUP' ] ; then rm -r '$PWD/debian' ; fi" EXIT
 
 set -u
 
 if [ ! -d .hg ]; then
     echo 'You are not inside a Mercurial repository!' 1>&2
     exit 1
 fi
 
 gethgversion
 debver="$version"
 if [ -n "$type" ] ; then
     debver="$debver~$type"
 fi
 if [ -n "$distance" ] ; then
     debver="$debver+$distance-$CODENAME-$node"
 elif [ "$DEBFLAGS" = "-S" ] ; then
     # for building a ppa (--source-only) for a release (distance == 0), we need
     # to version the distroseries so that we can upload to launchpad
     debver="$debver~${CODENAME}1"
 fi
 
 control=debian/control
 changelog=debian/changelog
 
 if [ "$BUILD" ]; then
     if [ -d debian ] ; then
         echo "Error! debian control directory already exists!"
         exit 1
     fi
 
-    cp -r $PWD/contrib/debian debian
+    cp -r "$PWD"/contrib/debian debian
 
     sed -i.tmp "s/__VERSION__/$debver/" $changelog
     sed -i.tmp "s/__DATE__/$(date --rfc-2822)/" $changelog
     sed -i.tmp "s/__CODENAME__/$CODENAME/" $changelog
     rm $changelog.tmp
 
     # remove the node from the version string
     SRCFILE="mercurial_$(echo $debver | sed "s,-$node,,").orig.tar.gz"
     "$PWD/hg" archive $SRCFILE
     mv $SRCFILE ..
     debuild -us -uc -i -I $DEBFLAGS
     if [ $? != 0 ]; then
         echo 'debuild failed!'
         exit 1
     fi
 
 fi
 if [ "$CLEANUP" ] ; then
     echo
     OUTPUTDIR=${OUTPUTDIR:=packages/$DISTID-$CODENAME}
     mkdir -p "$OUTPUTDIR"
     find ../mercurial*.deb ../mercurial_*.build ../mercurial_*.changes \
           ../mercurial*.dsc ../mercurial*.gz \
           -type f -newer $control -print0 2>/dev/null | \
       xargs -Inarf -0 mv narf "$OUTPUTDIR"
     echo "Built packages for $debver:"
     find "$OUTPUTDIR" -type f -newer $control -name '*.deb'
 fi

contrib/debian/rules

@@ -1,44 +1,44 b''
 #!/usr/bin/make -f
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
 CPUS=$(shell cat /proc/cpuinfo | grep -E ^processor | wc -l)
 
 %:
 	dh $@ --with python2
 
 override_dh_auto_test:
 	http_proxy='' dh_auto_test -- TESTFLAGS="-j$(CPUS)"
 
 override_dh_python2:
 	dh_python2
 	find debian/mercurial/usr/share -type d -empty -delete
 
 override_dh_install:
-	python$(PYVERS) setup.py install --root $(CURDIR)/debian/mercurial --install-layout=deb
+	python$(PYVERS) setup.py install --root "$(CURDIR)"/debian/mercurial --install-layout=deb
 	# chg
 	make -C contrib/chg \
-		DESTDIR=$(CURDIR)/debian/mercurial \
+		DESTDIR="$(CURDIR)"/debian/mercurial \
 		PREFIX=/usr \
 		clean install
 	# remove arch-independent python stuff
-	find $(CURDIR)/debian/mercurial/usr/lib \
+	find "$(CURDIR)"/debian/mercurial/usr/lib \
 		! -name '*.so' ! -type d -delete , \
 		-type d -empty -delete
-	python$(PYVERS) setup.py install --root $(CURDIR)/debian/mercurial-common --install-layout=deb
-	make install-doc PREFIX=$(CURDIR)/debian/mercurial-common/usr
+	python$(PYVERS) setup.py install --root "$(CURDIR)/debian/mercurial-common" --install-layout=deb
+	make install-doc PREFIX="$(CURDIR)"/debian/mercurial-common/usr
 	# remove arch-dependent python stuff
-	find $(CURDIR)/debian/mercurial-common/usr/lib \
+	find "$(CURDIR)"/debian/mercurial-common/usr/lib \
 		-name '*.so' ! -type d -delete , \
 		-type d -empty -delete
-	cp contrib/hg-ssh $(CURDIR)/debian/mercurial-common/usr/bin
-	mkdir -p $(CURDIR)/debian/mercurial-common/usr/share/mercurial
-	cp contrib/hgk $(CURDIR)/debian/mercurial-common/usr/share/mercurial
-	mkdir -p $(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/
-	cp contrib/debian/*.rc $(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/
+	cp contrib/hg-ssh "$(CURDIR)"/debian/mercurial-common/usr/bin
+	mkdir -p "$(CURDIR)"/debian/mercurial-common/usr/share/mercurial
+	cp contrib/hgk "$(CURDIR)"/debian/mercurial-common/usr/share/mercurial
+	mkdir -p "$(CURDIR)"/debian/mercurial-common/etc/mercurial/hgrc.d/
+	cp contrib/debian/*.rc "$(CURDIR)"/debian/mercurial-common/etc/mercurial/hgrc.d/
 	# completions
-	mkdir -p $(CURDIR)/debian/mercurial-common/usr/share/bash-completion/completions
-	cp contrib/bash_completion $(CURDIR)/debian/mercurial-common/usr/share/bash-completion/completions/hg
-	mkdir -p $(CURDIR)/debian/mercurial-common/usr/share/zsh/vendor-completions
-	cp contrib/zsh_completion $(CURDIR)/debian/mercurial-common/usr/share/zsh/vendor-completions/_hg
-	rm $(CURDIR)/debian/mercurial-common/usr/bin/hg
+	mkdir -p "$(CURDIR)"/debian/mercurial-common/usr/share/bash-completion/completions
+	cp contrib/bash_completion "$(CURDIR)"/debian/mercurial-common/usr/share/bash-completion/completions/hg
+	mkdir -p "$(CURDIR)"/debian/mercurial-common/usr/share/zsh/vendor-completions
+	cp contrib/zsh_completion "$(CURDIR)"/debian/mercurial-common/usr/share/zsh/vendor-completions/_hg
+	rm "$(CURDIR)"/debian/mercurial-common/usr/bin/hg