[Reproducible-commits] [dpkg] 38/63: dpkg-maintscript-helper: Quote shell variables

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/buildinfo
in repository dpkg.

commit 2969b2690f05af1bb3dca635cb5aabaf4ff006ba
Author: Carsten Hey <carsten at debian.org>
Date:   Sat Feb 20 10:25:28 2016 +0100

    dpkg-maintscript-helper: Quote shell variables
    
    Signed-off-by: Guillem Jover <guillem at debian.org>
---
 debian/changelog                   |  2 ++
 scripts/dpkg-maintscript-helper.sh | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 10faa93..f267261 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ dpkg (1.18.5) UNRELEASED; urgency=medium
   * Fix memory leak when unpacking conffiles.
   * Use fixed string matching for pathnames in dpkg-maintscript-helper.
     Thanks to Carsten Hey <carsten at debian.org>.
+  * Quote shell variables in dpkg-maintscript-helper.
+    Thanks to Carsten Hey <carsten at debian.org>.
   * Portability:
     - Move DPKG_ADMINDIR environment variable name out from update-alternatives
       code, to make life easier for non-dpkg-based systems.
diff --git a/scripts/dpkg-maintscript-helper.sh b/scripts/dpkg-maintscript-helper.sh
index 667a15b..7504145 100755
--- a/scripts/dpkg-maintscript-helper.sh
+++ b/scripts/dpkg-maintscript-helper.sh
@@ -88,8 +88,8 @@ prepare_rm_conffile() {
 	[ -e "$CONFFILE" ] || return 0
 	ensure_package_owns_file "$PACKAGE" "$CONFFILE" || return 0
 
-	local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
-	local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PACKAGE | \
+	local md5sum="$(md5sum "$CONFFILE" | sed -e 's/ .*//')"
+	local old_md5sum="$(dpkg-query -W -f='${Conffiles}' "$PACKAGE" | \
 		sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
 	if [ "$md5sum" != "$old_md5sum" ]; then
 		mv -f "$CONFFILE" "$CONFFILE.dpkg-backup"
@@ -191,8 +191,8 @@ prepare_mv_conffile() {
 
 	ensure_package_owns_file "$PACKAGE" "$CONFFILE" || return 0
 
-	local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
-	local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PACKAGE | \
+	local md5sum="$(md5sum "$CONFFILE" | sed -e 's/ .*//')"
+	local old_md5sum="$(dpkg-query -W -f='${Conffiles}' "$PACKAGE" | \
 		sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
 	if [ "$md5sum" = "$old_md5sum" ]; then
 		mv -f "$CONFFILE" "$CONFFILE.dpkg-remove"
@@ -204,7 +204,7 @@ finish_mv_conffile() {
 	local NEWCONFFILE="$2"
 	local PACKAGE="$3"
 
-	rm -f $OLDCONFFILE.dpkg-remove
+	rm -f "$OLDCONFFILE.dpkg-remove"
 
 	[ -e "$OLDCONFFILE" ] || return 0
 	ensure_package_owns_file "$PACKAGE" "$OLDCONFFILE" || return 0
@@ -372,8 +372,8 @@ dir_to_symlink() {
 		   [ \( ! -h "$PATHNAME" -a -d "$PATHNAME" -a \
 		        -f "$PATHNAME/.dpkg-staging-dir" \) -o \
 		     \( -h "$PATHNAME" -a \
-		        \( "$(readlink $PATHNAME)" = "$SYMLINK_TARGET" -o \
-		           "$(readlink -f $PATHNAME)" = "$SYMLINK_TARGET" \) \) ] &&
+		        \( "$(readlink "$PATHNAME")" = "$SYMLINK_TARGET" -o \
+		           "$(readlink -f "$PATHNAME")" = "$SYMLINK_TARGET" \) \) ] &&
 		   dpkg --compare-versions "$2" le-nl "$LASTVERSION"; then
 			abort_dir_to_symlink "$PATHNAME"
 		fi
@@ -494,8 +494,8 @@ symlink_match()
 	local SYMLINK="$1"
 	local SYMLINK_TARGET="$2"
 
-	[ "$(readlink $SYMLINK)" = "$SYMLINK_TARGET" ] || \
-	[ "$(readlink -f $SYMLINK)" = "$SYMLINK_TARGET" ]
+	[ "$(readlink "$SYMLINK")" = "$SYMLINK_TARGET" ] || \
+	[ "$(readlink -f "$SYMLINK")" = "$SYMLINK_TARGET" ]
 }
 
 debug() {
@@ -546,7 +546,7 @@ badusage() {
 # Main code
 set -e
 
-PROGNAME=$(basename $0)
+PROGNAME=$(basename "$0")
 version="unknown"
 command="$1"
 [ $# -gt 0 ] || badusage "missing command"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git