Kaynağa Gözat

dpkg-maintscript-helper: Quote shell variables

Signed-off-by: Guillem Jover <guillem@debian.org>
Carsten Hey 10 yıl önce
ebeveyn
işleme
2969b2690f
2 değiştirilmiş dosya ile 12 ekleme ve 10 silme
  1. 2 0
      debian/changelog
  2. 10 10
      scripts/dpkg-maintscript-helper.sh

+ 2 - 0
debian/changelog

@@ -29,6 +29,8 @@ dpkg (1.18.5) UNRELEASED; urgency=medium
   * Fix memory leak when unpacking conffiles.
   * Fix memory leak when unpacking conffiles.
   * Use fixed string matching for pathnames in dpkg-maintscript-helper.
   * Use fixed string matching for pathnames in dpkg-maintscript-helper.
     Thanks to Carsten Hey <carsten@debian.org>.
     Thanks to Carsten Hey <carsten@debian.org>.
+  * Quote shell variables in dpkg-maintscript-helper.
+    Thanks to Carsten Hey <carsten@debian.org>.
   * Portability:
   * Portability:
     - Move DPKG_ADMINDIR environment variable name out from update-alternatives
     - Move DPKG_ADMINDIR environment variable name out from update-alternatives
       code, to make life easier for non-dpkg-based systems.
       code, to make life easier for non-dpkg-based systems.

+ 10 - 10
scripts/dpkg-maintscript-helper.sh

@@ -88,8 +88,8 @@ prepare_rm_conffile() {
 	[ -e "$CONFFILE" ] || return 0
 	[ -e "$CONFFILE" ] || return 0
 	ensure_package_owns_file "$PACKAGE" "$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 }")"
 		sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
 	if [ "$md5sum" != "$old_md5sum" ]; then
 	if [ "$md5sum" != "$old_md5sum" ]; then
 		mv -f "$CONFFILE" "$CONFFILE.dpkg-backup"
 		mv -f "$CONFFILE" "$CONFFILE.dpkg-backup"
@@ -191,8 +191,8 @@ prepare_mv_conffile() {
 
 
 	ensure_package_owns_file "$PACKAGE" "$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 }")"
 		sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
 	if [ "$md5sum" = "$old_md5sum" ]; then
 	if [ "$md5sum" = "$old_md5sum" ]; then
 		mv -f "$CONFFILE" "$CONFFILE.dpkg-remove"
 		mv -f "$CONFFILE" "$CONFFILE.dpkg-remove"
@@ -204,7 +204,7 @@ finish_mv_conffile() {
 	local NEWCONFFILE="$2"
 	local NEWCONFFILE="$2"
 	local PACKAGE="$3"
 	local PACKAGE="$3"
 
 
-	rm -f $OLDCONFFILE.dpkg-remove
+	rm -f "$OLDCONFFILE.dpkg-remove"
 
 
 	[ -e "$OLDCONFFILE" ] || return 0
 	[ -e "$OLDCONFFILE" ] || return 0
 	ensure_package_owns_file "$PACKAGE" "$OLDCONFFILE" || return 0
 	ensure_package_owns_file "$PACKAGE" "$OLDCONFFILE" || return 0
@@ -372,8 +372,8 @@ dir_to_symlink() {
 		   [ \( ! -h "$PATHNAME" -a -d "$PATHNAME" -a \
 		   [ \( ! -h "$PATHNAME" -a -d "$PATHNAME" -a \
 		        -f "$PATHNAME/.dpkg-staging-dir" \) -o \
 		        -f "$PATHNAME/.dpkg-staging-dir" \) -o \
 		     \( -h "$PATHNAME" -a \
 		     \( -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
 		   dpkg --compare-versions "$2" le-nl "$LASTVERSION"; then
 			abort_dir_to_symlink "$PATHNAME"
 			abort_dir_to_symlink "$PATHNAME"
 		fi
 		fi
@@ -494,8 +494,8 @@ symlink_match()
 	local SYMLINK="$1"
 	local SYMLINK="$1"
 	local SYMLINK_TARGET="$2"
 	local SYMLINK_TARGET="$2"
 
 
-	[ "$(readlink $SYMLINK)" = "$SYMLINK_TARGET" ] || \
-	[ "$(readlink -f $SYMLINK)" = "$SYMLINK_TARGET" ]
+	[ "$(readlink "$SYMLINK")" = "$SYMLINK_TARGET" ] || \
+	[ "$(readlink -f "$SYMLINK")" = "$SYMLINK_TARGET" ]
 }
 }
 
 
 debug() {
 debug() {
@@ -546,7 +546,7 @@ badusage() {
 # Main code
 # Main code
 set -e
 set -e
 
 
-PROGNAME=$(basename $0)
+PROGNAME=$(basename "$0")
 version="unknown"
 version="unknown"
 command="$1"
 command="$1"
 [ $# -gt 0 ] || badusage "missing command"
 [ $# -gt 0 ] || badusage "missing command"