[xen-tools-dev] [PATCH] Replace single quotes by doubles quotes in scripts

Stéphane Jourdois sjourdois at gmail.com
Sun Jul 11 15:38:58 CEST 2010


This helps make t/quoted-strings.t pass.
---
 hooks/centos-4/40-setup-networking      |    2 +-
 hooks/centos-5/40-setup-networking      |    2 +-
 hooks/dapper/40-setup-networking        |    2 +-
 hooks/dapper/70-install-ssh             |    4 ++--
 hooks/debian/20-setup-apt               |    2 +-
 hooks/debian/40-setup-networking        |    2 +-
 hooks/debian/70-install-ssh             |    4 ++--
 hooks/edgy/40-setup-networking          |    2 +-
 hooks/edgy/70-install-ssh               |    4 ++--
 hooks/fedora-core-6/40-setup-networking |    2 +-
 hooks/gentoo/40-setup-networking        |    2 +-
 hooks/intrepid/40-setup-networking      |    2 +-
 hooks/intrepid/70-install-ssh           |    4 ++--
 hooks/karmic/40-setup-networking        |    2 +-
 hooks/karmic/70-install-ssh             |    4 ++--
 15 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/hooks/centos-4/40-setup-networking b/hooks/centos-4/40-setup-networking
index 980dcd4..52a9a95 100755
--- a/hooks/centos-4/40-setup-networking
+++ b/hooks/centos-4/40-setup-networking
@@ -78,7 +78,7 @@ E_O_STATIC
     # temporarily to /etc/resolv.conf.old. Use that file, it
     # will be restored after hooks are run.
     #
-    if [ '*' != "*$nameserver" ]; then
+    if [ "*" != "*$nameserver" ]; then
     rm -f ${prefix}/etc/resolv.conf.old
     for ns in $nameserver; do 
         echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
diff --git a/hooks/centos-5/40-setup-networking b/hooks/centos-5/40-setup-networking
index 980dcd4..52a9a95 100755
--- a/hooks/centos-5/40-setup-networking
+++ b/hooks/centos-5/40-setup-networking
@@ -78,7 +78,7 @@ E_O_STATIC
     # temporarily to /etc/resolv.conf.old. Use that file, it
     # will be restored after hooks are run.
     #
-    if [ '*' != "*$nameserver" ]; then
+    if [ "*" != "*$nameserver" ]; then
     rm -f ${prefix}/etc/resolv.conf.old
     for ns in $nameserver; do 
         echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
diff --git a/hooks/dapper/40-setup-networking b/hooks/dapper/40-setup-networking
index 501c271..3ad6d2e 100755
--- a/hooks/dapper/40-setup-networking
+++ b/hooks/dapper/40-setup-networking
@@ -118,7 +118,7 @@ E_O_STATIC
     # temporarily to /etc/resolv.conf.old. Use that file, it
     # will be restored after hooks are run.
     #
-    if [ '*' != "*$nameserver" ]; then
+    if [ "*" != "*$nameserver" ]; then
     rm -f ${prefix}/etc/resolv.conf.old
     for ns in $nameserver; do 
         echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
diff --git a/hooks/dapper/70-install-ssh b/hooks/dapper/70-install-ssh
index 9ab199a..8dfe2c5 100755
--- a/hooks/dapper/70-install-ssh
+++ b/hooks/dapper/70-install-ssh
@@ -36,7 +36,7 @@ mkdir -p ${prefix}/etc/ssh
 #
 #  Second, Generate the Host RSA Key
 #
-if ssh-keygen -t rsa -N '' -f ${prefix}/etc/ssh/ssh_host_rsa_key -C "root@${hostname}"; then
+if ssh-keygen -t rsa -N "" -f ${prefix}/etc/ssh/ssh_host_rsa_key -C "root@${hostname}"; then
     logMessage "successfully generetaged Host RSA"
 else
     logMessage "failed to generate Host RSA Key"
@@ -45,7 +45,7 @@ fi
 #
 #  Third, Generate the Host DSA Key
 #
-if ssh-keygen -t dsa -N '' -f ${prefix}/etc/ssh/ssh_host_dsa_key -C "root@${hostname}"; then
+if ssh-keygen -t dsa -N "" -f ${prefix}/etc/ssh/ssh_host_dsa_key -C "root@${hostname}"; then
     logMessage "successfully generetaged Host DSA"
 else
     logMessage "failed to generate Host DSA Key"
diff --git a/hooks/debian/20-setup-apt b/hooks/debian/20-setup-apt
index 28097d4..7f9dcfc 100755
--- a/hooks/debian/20-setup-apt
+++ b/hooks/debian/20-setup-apt
@@ -73,7 +73,7 @@ E_O_APT
 #  If the host system has security support then enable that here, too,
 #  except if we're installing Debian Unstable.
 #
-if ( test "${dist}" '!=' 'sid' && test "${dist}" '!=' 'unstable' && \
+if ( test "${dist}" "!=" "sid" && test "${dist}" "!=" "unstable" && \
      test -e /etc/apt/sources.list && \
      grep ^deb.*security -r /etc/apt/sources.list /etc/apt/sources.list.d >/dev/null 2>/dev/null ) ; then
 
diff --git a/hooks/debian/40-setup-networking b/hooks/debian/40-setup-networking
index 8c01eb6..dde8218 100755
--- a/hooks/debian/40-setup-networking
+++ b/hooks/debian/40-setup-networking
@@ -138,7 +138,7 @@ E_O_STATIC
     # temporarily to /etc/resolv.conf.old. Use that file, it
     # will be restored after hooks are run.
     #
-    if [ '*' != "*$nameserver" ]; then
+    if [ "*" != "*$nameserver" ]; then
     rm -f ${prefix}/etc/resolv.conf.old
     for ns in $nameserver; do 
         echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
diff --git a/hooks/debian/70-install-ssh b/hooks/debian/70-install-ssh
index 9ab199a..8dfe2c5 100755
--- a/hooks/debian/70-install-ssh
+++ b/hooks/debian/70-install-ssh
@@ -36,7 +36,7 @@ mkdir -p ${prefix}/etc/ssh
 #
 #  Second, Generate the Host RSA Key
 #
-if ssh-keygen -t rsa -N '' -f ${prefix}/etc/ssh/ssh_host_rsa_key -C "root@${hostname}"; then
+if ssh-keygen -t rsa -N "" -f ${prefix}/etc/ssh/ssh_host_rsa_key -C "root@${hostname}"; then
     logMessage "successfully generetaged Host RSA"
 else
     logMessage "failed to generate Host RSA Key"
@@ -45,7 +45,7 @@ fi
 #
 #  Third, Generate the Host DSA Key
 #
-if ssh-keygen -t dsa -N '' -f ${prefix}/etc/ssh/ssh_host_dsa_key -C "root@${hostname}"; then
+if ssh-keygen -t dsa -N "" -f ${prefix}/etc/ssh/ssh_host_dsa_key -C "root@${hostname}"; then
     logMessage "successfully generetaged Host DSA"
 else
     logMessage "failed to generate Host DSA Key"
diff --git a/hooks/edgy/40-setup-networking b/hooks/edgy/40-setup-networking
index bbee228..239ca0e 100755
--- a/hooks/edgy/40-setup-networking
+++ b/hooks/edgy/40-setup-networking
@@ -127,7 +127,7 @@ E_O_STATIC
     # temporarily to /etc/resolv.conf.old. Use that file, it
     # will be restored after hooks are run.
     #
-    if [ '*' != "*$nameserver" ]; then
+    if [ "*" != "*$nameserver" ]; then
     rm -f ${prefix}/etc/resolv.conf.old
     for ns in $nameserver; do 
         echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
diff --git a/hooks/edgy/70-install-ssh b/hooks/edgy/70-install-ssh
index 9ab199a..8dfe2c5 100755
--- a/hooks/edgy/70-install-ssh
+++ b/hooks/edgy/70-install-ssh
@@ -36,7 +36,7 @@ mkdir -p ${prefix}/etc/ssh
 #
 #  Second, Generate the Host RSA Key
 #
-if ssh-keygen -t rsa -N '' -f ${prefix}/etc/ssh/ssh_host_rsa_key -C "root@${hostname}"; then
+if ssh-keygen -t rsa -N "" -f ${prefix}/etc/ssh/ssh_host_rsa_key -C "root@${hostname}"; then
     logMessage "successfully generetaged Host RSA"
 else
     logMessage "failed to generate Host RSA Key"
@@ -45,7 +45,7 @@ fi
 #
 #  Third, Generate the Host DSA Key
 #
-if ssh-keygen -t dsa -N '' -f ${prefix}/etc/ssh/ssh_host_dsa_key -C "root@${hostname}"; then
+if ssh-keygen -t dsa -N "" -f ${prefix}/etc/ssh/ssh_host_dsa_key -C "root@${hostname}"; then
     logMessage "successfully generetaged Host DSA"
 else
     logMessage "failed to generate Host DSA Key"
diff --git a/hooks/fedora-core-6/40-setup-networking b/hooks/fedora-core-6/40-setup-networking
index 980dcd4..52a9a95 100755
--- a/hooks/fedora-core-6/40-setup-networking
+++ b/hooks/fedora-core-6/40-setup-networking
@@ -78,7 +78,7 @@ E_O_STATIC
     # temporarily to /etc/resolv.conf.old. Use that file, it
     # will be restored after hooks are run.
     #
-    if [ '*' != "*$nameserver" ]; then
+    if [ "*" != "*$nameserver" ]; then
     rm -f ${prefix}/etc/resolv.conf.old
     for ns in $nameserver; do 
         echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
diff --git a/hooks/gentoo/40-setup-networking b/hooks/gentoo/40-setup-networking
index 6434aae..6417f58 100755
--- a/hooks/gentoo/40-setup-networking
+++ b/hooks/gentoo/40-setup-networking
@@ -102,7 +102,7 @@ E_O_STATIC
     # temporarily to /etc/resolv.conf.old. Use that file, it
     # will be restored after hooks are run.
     #
-    if [ '*' != "*$nameserver" ]; then
+    if [ "*" != "*$nameserver" ]; then
     rm -f ${prefix}/etc/resolv.conf.old
     for ns in $nameserver; do 
         echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
diff --git a/hooks/intrepid/40-setup-networking b/hooks/intrepid/40-setup-networking
index bbee228..239ca0e 100755
--- a/hooks/intrepid/40-setup-networking
+++ b/hooks/intrepid/40-setup-networking
@@ -127,7 +127,7 @@ E_O_STATIC
     # temporarily to /etc/resolv.conf.old. Use that file, it
     # will be restored after hooks are run.
     #
-    if [ '*' != "*$nameserver" ]; then
+    if [ "*" != "*$nameserver" ]; then
     rm -f ${prefix}/etc/resolv.conf.old
     for ns in $nameserver; do 
         echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
diff --git a/hooks/intrepid/70-install-ssh b/hooks/intrepid/70-install-ssh
index 9ab199a..8dfe2c5 100755
--- a/hooks/intrepid/70-install-ssh
+++ b/hooks/intrepid/70-install-ssh
@@ -36,7 +36,7 @@ mkdir -p ${prefix}/etc/ssh
 #
 #  Second, Generate the Host RSA Key
 #
-if ssh-keygen -t rsa -N '' -f ${prefix}/etc/ssh/ssh_host_rsa_key -C "root@${hostname}"; then
+if ssh-keygen -t rsa -N "" -f ${prefix}/etc/ssh/ssh_host_rsa_key -C "root@${hostname}"; then
     logMessage "successfully generetaged Host RSA"
 else
     logMessage "failed to generate Host RSA Key"
@@ -45,7 +45,7 @@ fi
 #
 #  Third, Generate the Host DSA Key
 #
-if ssh-keygen -t dsa -N '' -f ${prefix}/etc/ssh/ssh_host_dsa_key -C "root@${hostname}"; then
+if ssh-keygen -t dsa -N "" -f ${prefix}/etc/ssh/ssh_host_dsa_key -C "root@${hostname}"; then
     logMessage "successfully generetaged Host DSA"
 else
     logMessage "failed to generate Host DSA Key"
diff --git a/hooks/karmic/40-setup-networking b/hooks/karmic/40-setup-networking
index bbee228..239ca0e 100755
--- a/hooks/karmic/40-setup-networking
+++ b/hooks/karmic/40-setup-networking
@@ -127,7 +127,7 @@ E_O_STATIC
     # temporarily to /etc/resolv.conf.old. Use that file, it
     # will be restored after hooks are run.
     #
-    if [ '*' != "*$nameserver" ]; then
+    if [ "*" != "*$nameserver" ]; then
     rm -f ${prefix}/etc/resolv.conf.old
     for ns in $nameserver; do 
         echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old
diff --git a/hooks/karmic/70-install-ssh b/hooks/karmic/70-install-ssh
index 9ab199a..8dfe2c5 100755
--- a/hooks/karmic/70-install-ssh
+++ b/hooks/karmic/70-install-ssh
@@ -36,7 +36,7 @@ mkdir -p ${prefix}/etc/ssh
 #
 #  Second, Generate the Host RSA Key
 #
-if ssh-keygen -t rsa -N '' -f ${prefix}/etc/ssh/ssh_host_rsa_key -C "root@${hostname}"; then
+if ssh-keygen -t rsa -N "" -f ${prefix}/etc/ssh/ssh_host_rsa_key -C "root@${hostname}"; then
     logMessage "successfully generetaged Host RSA"
 else
     logMessage "failed to generate Host RSA Key"
@@ -45,7 +45,7 @@ fi
 #
 #  Third, Generate the Host DSA Key
 #
-if ssh-keygen -t dsa -N '' -f ${prefix}/etc/ssh/ssh_host_dsa_key -C "root@${hostname}"; then
+if ssh-keygen -t dsa -N "" -f ${prefix}/etc/ssh/ssh_host_dsa_key -C "root@${hostname}"; then
     logMessage "successfully generetaged Host DSA"
 else
     logMessage "failed to generate Host DSA Key"
-- 
1.5.6.5



More information about the xen-tools-dev mailing list