Convert `echo -e` to `printf` #208558 by Davide Pesavento.

(Portage version: 2.2_pre5)

4 files changed, 38 insertions, 32 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 644ca20b81ed..09ef6bfc61e4 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/dhcp
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.141 2007/12/25 16:25:18 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.142 2008/03/29 19:47:53 vapier Exp $
+
+  29 Mar 2008; Mike Frysinger <vapier@gentoo.org>
+  files/dhcp-3.0.3-dhclient-ntp.patch,
+  files/dhcp-3.0.3-dhclient-resolvconf.patch,
+  files/dhcp-3.1.0a1-dhclient-resolvconf.patch:
+  Convert `echo -e` to `printf` #208558 by Davide Pesavento.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing uberlord from metadata.xml as per #199318.
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-ntp.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-ntp.patch
index b5f9429a84c3..d84e6f6138a9 100644
--- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-ntp.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-ntp.patch
@@ -30,7 +30,7 @@
 +      done
 +      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
 +      conf="${conf}logfile /var/log/ntp.log\n"
-+      echo -e "${conf}" > /etc/ntp.conf
++      printf "${conf}" > /etc/ntp.conf
 +      chmod 644 /etc/ntp.conf
 +    fi
 +  fi
@@ -59,7 +59,7 @@
 +      done
 +      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
 +      conf="${conf}logfile /var/log/ntp.log\n"
-+      echo -e "${conf}" > /etc/ntp.conf
++      printf "${conf}" > /etc/ntp.conf
 +      chmod 644 /etc/ntp.conf
 +    fi
 +  fi
@@ -90,7 +90,7 @@
 +      done
 +      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
 +      conf="${conf}logfile /var/log/ntp.log\n"
-+      echo -e "${conf}" > /etc/ntp.conf
++      printf "${conf}" > /etc/ntp.conf
 +      chmod 644 /etc/ntp.conf
 +    fi
 +  fi
@@ -119,7 +119,7 @@
 +      done
 +      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
 +      conf="${conf}logfile /var/log/ntp.log\n"
-+      echo -e "${conf}" > /etc/ntp.conf
++      printf "${conf}" > /etc/ntp.conf
 +      chmod 644 /etc/ntp.conf
 +    fi
 +  fi
@@ -148,7 +148,7 @@
 +      done
 +      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
 +      conf="${conf}logfile /var/log/ntp.log\n"
-+      echo -e "${conf}" > /etc/ntp.conf
++      printf "${conf}" > /etc/ntp.conf
 +      chmod 644 /etc/ntp.conf
 +    fi
 +  fi
@@ -177,7 +177,7 @@
 +      done
 +      conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
 +      conf="${conf}logfile /var/log/ntp.log\n"
-+      echo -e "${conf}" > /etc/ntp.conf
++      printf "${conf}" > /etc/ntp.conf
 +      chmod 644 /etc/ntp.conf
 +    fi
 +  fi
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch
index fac6b26a9723..8e499fcb9e89 100644
--- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-resolvconf.patch
@@ -19,9 +19,9 @@
 +        conf="${conf}nameserver $nameserver\n"
 +      done
 +      if [ -x /sbin/resolvconf ]; then
-+        echo -e "$conf" | resolvconf -a "$interface"
++        printf "$conf" | resolvconf -a "$interface"
 +      else
-+        echo -e "$conf" > /etc/resolv.conf
++        printf "$conf" > /etc/resolv.conf
 +        chmod 644 /etc/resolv.conf
 +      fi
 +    fi
@@ -60,9 +60,9 @@
 +        conf="${conf}nameserver $nameserver\n"
        done
 +      if [ -x /sbin/resolvconf ]; then
-+        echo -e "$conf" | resolvconf -a "$interface"
++        printf "$conf" | resolvconf -a "$interface"
 +      else
-+        echo -e "$conf" > /etc/resolv.conf
++        printf "$conf" > /etc/resolv.conf
 +        chmod 644 /etc/resolv.conf
 +      fi
      fi
@@ -90,9 +90,9 @@
 +        conf="${conf}nameserver $nameserver\n"
 +      done
 +      if [ -x /sbin/resolvconf ]; then
-+        echo -e "$conf" | resolvconf -a "$interface"
++        printf "$conf" | resolvconf -a "$interface"
 +      else
-+        echo -e "$conf" > /etc/resolv.conf
++        printf "$conf" > /etc/resolv.conf
 +        chmod 644 /etc/resolv.conf
 +      fi
 +    fi
@@ -120,9 +120,9 @@
 +        conf="${conf}nameserver $nameserver\n"
 +      done
 +      if [ -x /sbin/resolvconf ]; then
-+        echo -e "$conf" | resolvconf -a "$interface"
++        printf "$conf" | resolvconf -a "$interface"
 +      else
-+        echo -e "$conf" > /etc/resolv.conf
++        printf "$conf" > /etc/resolv.conf
 +        chmod 644 /etc/resolv.conf
 +      fi
 +    fi
@@ -150,9 +150,9 @@
 +        conf="${conf}nameserver $nameserver\n"
 +      done
 +      if [ -x /sbin/resolvconf ]; then
-+        echo -e "$conf" | resolvconf -a "$interface"
++        printf "$conf" | resolvconf -a "$interface"
 +      else
-+        echo -e "$conf" > /etc/resolv.conf
++        printf "$conf" > /etc/resolv.conf
 +        chmod 644 /etc/resolv.conf
 +      fi
 +    fi
@@ -180,9 +180,9 @@
 +        conf="${conf}nameserver $nameserver\n"
 +      done
 +      if [ -x /sbin/resolvconf ]; then
-+        echo -e "$conf" | resolvconf -a "$interface"
++        printf "$conf" | resolvconf -a "$interface"
 +      else
-+        echo -e "$conf" > /etc/resolv.conf
++        printf "$conf" > /etc/resolv.conf
 +        chmod 644 /etc/resolv.conf
 +      fi
 +    fi
diff --git a/net-misc/dhcp/files/dhcp-3.1.0a1-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-3.1.0a1-dhclient-resolvconf.patch
index 2baaa78418e6..5c420ae6e0f4 100644
--- a/net-misc/dhcp/files/dhcp-3.1.0a1-dhclient-resolvconf.patch
+++ b/net-misc/dhcp/files/dhcp-3.1.0a1-dhclient-resolvconf.patch
@@ -24,9 +24,9 @@ diff -ur client.orig/scripts/bsdos client/scripts/bsdos
 +        conf="${conf}nameserver $nameserver\n"
 +      done
 +      if [ -x /sbin/resolvconf ]; then
-+        echo -e "$conf" | resolvconf -a "$interface"
++        printf "$conf" | resolvconf -a "$interface"
 +      else
-+        echo -e "$conf" > /etc/resolv.conf
++        printf "$conf" > /etc/resolv.conf
 +        chmod 644 /etc/resolv.conf
 +      fi
      fi
@@ -84,9 +84,9 @@ diff -ur client.orig/scripts/freebsd client/scripts/freebsd
 -      if [ $exit_status -ne 0 ]; then
 -	$LOGGER "Error while writing new /etc/resolv.conf."
 +      if [ -x /sbin/resolvconf ]; then
-+        echo -e "$conf" | resolvconf -a "$interface"
++        printf "$conf" | resolvconf -a "$interface"
 +      else
-+        echo -e "$conf" > /etc/resolv.conf
++        printf "$conf" > /etc/resolv.conf
 +        chmod 644 /etc/resolv.conf
        fi
      fi
@@ -118,9 +118,9 @@ diff -ur client.orig/scripts/linux client/scripts/linux
 +        conf="${conf}nameserver $nameserver\n"
 +      done
 +      if [ -x /sbin/resolvconf ]; then
-+        echo -e "$conf" | resolvconf -a "$interface"
++        printf "$conf" | resolvconf -a "$interface"
 +      else
-+        echo -e "$conf" > /etc/resolv.conf
++        printf "$conf" > /etc/resolv.conf
 +        chmod 644 /etc/resolv.conf
 +      fi
      fi
@@ -158,9 +158,9 @@ diff -ur client.orig/scripts/netbsd client/scripts/netbsd
 +        conf="${conf}nameserver $nameserver\n"
 +      done
 +      if [ -x /sbin/resolvconf ]; then
-+        echo -e "$conf" | resolvconf -a "$interface"
++        printf "$conf" | resolvconf -a "$interface"
 +      else
-+        echo -e "$conf" > /etc/resolv.conf
++        printf "$conf" > /etc/resolv.conf
 +        chmod 644 /etc/resolv.conf
 +      fi
      fi
@@ -198,9 +198,9 @@ diff -ur client.orig/scripts/openbsd client/scripts/openbsd
 +        conf="${conf}nameserver $nameserver\n"
 +      done
 +      if [ -x /sbin/resolvconf ]; then
-+        echo -e "$conf" | resolvconf -a "$interface"
++        printf "$conf" | resolvconf -a "$interface"
 +      else
-+        echo -e "$conf" > /etc/resolv.conf
++        printf "$conf" > /etc/resolv.conf
 +        chmod 644 /etc/resolv.conf
 +      fi
      fi
@@ -238,9 +238,9 @@ diff -ur client.orig/scripts/solaris client/scripts/solaris
 +        conf="${conf}nameserver $nameserver\n"
 +      done
 +      if [ -x /sbin/resolvconf ]; then
-+        echo -e "$conf" | resolvconf -a "$interface"
++        printf "$conf" | resolvconf -a "$interface"
 +      else
-+        echo -e "$conf" > /etc/resolv.conf
++        printf "$conf" > /etc/resolv.conf
 +        chmod 644 /etc/resolv.conf
 +      fi
      fi