Avoid escaped quotes by using $() instead of backticks

The escaped quotes mess up syntax highlighting.

diff --git a/ChangeLog b/ChangeLog
index 79844675ad48943bec38e07a286199d36dbc8f48..cc5213731dbd08143b9ea4714148b871709d75ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-06  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-name.sh: Avoid escaped quotes messing with syntax
+       highlighting by using $() instead of backticks.
+       * scripts/dpkg-buildpackage.sh: Likewise.
+
 2007-09-06  Guillem Jover  <guillem@debian.org>
 
        * scripts/dpkg-genchanges.pl ($host_arch): Do not declare as 'our'.

diff --git a/scripts/dpkg-buildpackage.sh b/scripts/dpkg-buildpackage.sh
index 7c1b64572e4f8ae4c3cfb293189535d2d006c2fd..82508c1de20dba87becc7fc6eddb476f0f24237a 100755 (executable)
--- a/scripts/dpkg-buildpackage.sh
+++ b/scripts/dpkg-buildpackage.sh
@@ -4,7 +4,7 @@ set -e
 
 version="1.10.10"; # This line modified by Makefile
 
-progname="`basename \"$0\"`"
+progname="$(basename "$0")"
 
 showversion () {
        echo "Debian $progname version $version."
@@ -86,7 +86,7 @@ admindir=''
 
 while [ $# != 0 ]
 do
-       value="`echo x\"$1\" | sed -e 's/x--.*=//;s/^x-.//'`"
+       value="$(echo x"$1" | sed -e 's/x--.*=//;s/^x-.//')"
        case "$1" in
        -h|--help)
                usage; exit 0 ;;
@@ -160,7 +160,7 @@ mustsetvar () {
 }
 
 curd="`pwd`"
-dirn="`basename \"$curd\"`"
+dirn="$(basename "$curd")"
 mustsetvar package "`dpkg-parsechangelog | sed -n 's/^Source: //p'`" "source package is"
 mustsetvar changesversion "`dpkg-parsechangelog | sed -n 's/^Version: //p'`" "source version is"
 if [ -n "$changedby" ]; then maintainer="$changedby";
@@ -173,7 +173,7 @@ if [ x$sourceonly = x ]; then
 else
        arch=source
 fi
-mustsetvar sversion "`echo \"$changesversion\" | perl -pe 's/^\d+://'`" "source version without epoch"
+mustsetvar sversion "$(echo "$changesversion" | perl -pe 's/^\d+://')" "source version without epoch"
 pv="${package}_${sversion}"
 pva="${package}_${sversion}_${arch}"
 

diff --git a/scripts/dpkg-name.sh b/scripts/dpkg-name.sh
index e762417db6a86bb1f2f8eb544b7339c7599c7156..762869313093fe3ea2c50d4ad635c920679eeb87 100755 (executable)
--- a/scripts/dpkg-name.sh
+++ b/scripts/dpkg-name.sh
@@ -3,7 +3,7 @@
 set -e
 
 # Time-stamp: <96/05/03 13:59:41 root>
-prog="`basename \"${0}\"`"
+prog="$(basename "${0}")"
 version="1.2.3"; # This line modified by Makefile
 purpose="rename Debian packages to full package names"