From a6b5cbe296ea470a0674fc7ad2edb726850a19c7 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+burette@autogeree.net>
Date: Mon, 25 Feb 2013 13:20:43 +0100
Subject: [PATCH] Correction : {etc,var}/ -> "${tool}"/{etc,var}/ .

---
 vm_hosted | 58 +++++++++++++++++++++++++++----------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/vm_hosted b/vm_hosted
index f610701..62bd86e 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -438,25 +438,25 @@ rule_postfix_configure () {
 	 ../crt+crl.self-signed.pem \
 	 /etc/postfix/$vm_domainname/smtpd/x509/ca/crt.pem
 	sudo install -m 400 -o root -g root \
-	           var/pub/x509/service/smtpd/crt+crl.self-signed.pem \
+	     "$tool"/var/pub/x509/service/smtpd/crt+crl.self-signed.pem \
 	 /etc/postfix/$vm_domainname/smtpd/x509/crt+crl.self-signed.pem
 	sudo install -m 400 -o root -g root \
-	           var/pub/x509/service/smtpd/crt.pem \
+	     "$tool"/var/pub/x509/service/smtpd/crt.pem \
 	 /etc/postfix/$vm_domainname/smtpd/x509/crt.pem
 	sudo install -m 400 -o root -g root \
-	     var/pub/x509/service/smtpd/crt+root.pem \
+	     "$tool"/var/pub/x509/service/smtpd/crt+root.pem \
 	 /etc/postfix/$vm_domainname/smtpd/x509/crt+root.pem
 	sudo install -m 400 -o root -g root \
-	           var/pub/x509/service/smtpd/crt+crl.self-signed.pem \
+	     "$tool"/var/pub/x509/service/smtpd/crt+crl.self-signed.pem \
 	 /etc/postfix/$vm_domainname/smtpd/x509/crt+crl.self-signed.pem
 	sudo install -m 660 -o root -g root \
-	  etc/postfix/$vm_domainname/header_checks \
-	 /etc/postfix/$vm_domainname/header_checks
+	 "$tool"/etc/postfix/$vm_domainname/header_checks \
+	        /etc/postfix/$vm_domainname/header_checks
 	sudo install -m 664 -o root -g root \
-	  etc/postfix/aliases \
-	 /etc/postfix/aliases
+	 "$tool"/etc/postfix/aliases \
+	        /etc/postfix/aliases
 	sudo newaliases -oA/etc/postfix/aliases
-	cat /dev/stdin etc/postfix/main.cf <<-EOF |
+	cat /dev/stdin "$tool"/etc/postfix/main.cf <<-EOF |
 		mydomain      = $vm_domainname
 		myorigin      = \$mydomain
 		myhostname    = $vm_hostname.\$mydomain
@@ -466,34 +466,34 @@ rule_postfix_configure () {
 	sudo install -m 664 -o root -g root /dev/stdin \
 	 /etc/postfix/main.cf
 	sudo install -m 664 -o root -g root \
-	  etc/postfix/master.cf \
-	 /etc/postfix/master.cf
+	 "$tool"/etc/postfix/master.cf \
+	        /etc/postfix/master.cf
 	sudo install -m 660 -o root -g root \
-	  etc/postfix/$vm_domainname/smtp/x509/policy \
-	 /etc/postfix/$vm_domainname/smtp/x509/policy
+	 "$tool"/etc/postfix/$vm_domainname/smtp/x509/policy \
+	        /etc/postfix/$vm_domainname/smtp/x509/policy
 	sudo postmap hash:/etc/postfix/$vm_domainname/smtp/x509/policy
 	sudo install -m 660 -o root -g root \
-	  etc/postfix/$vm_domainname/smtp/header_checks \
-	 /etc/postfix/$vm_domainname/smtp/header_checks
+	 "$tool"/etc/postfix/$vm_domainname/smtp/header_checks \
+	        /etc/postfix/$vm_domainname/smtp/header_checks
 	sudo install -m 660 -o root -g root \
-	  etc/postfix/$vm_domainname/smtpd/sender_access \
-	 /etc/postfix/$vm_domainname/smtpd/sender_access
+	 "$tool"/etc/postfix/$vm_domainname/smtpd/sender_access \
+	        /etc/postfix/$vm_domainname/smtpd/sender_access
 	sudo postmap hash:/etc/postfix/$vm_domainname/smtpd/sender_access
 	sudo install -m 660 -o root -g root \
-	  etc/postfix/$vm_domainname/smtpd/client_blacklist \
-	 /etc/postfix/$vm_domainname/smtpd/client_blacklist
+	 "$tool"/etc/postfix/$vm_domainname/smtpd/client_blacklist \
+	        /etc/postfix/$vm_domainname/smtpd/client_blacklist
 	sudo postmap hash:/etc/postfix/$vm_domainname/smtpd/client_blacklist
 	sudo install -m 660 -o root -g root \
-	  etc/postfix/$vm_domainname/smtpd/relay_clientcerts \
-	 /etc/postfix/$vm_domainname/smtpd/relay_clientcerts
+	 "$tool"/etc/postfix/$vm_domainname/smtpd/relay_clientcerts \
+	        /etc/postfix/$vm_domainname/smtpd/relay_clientcerts
 	sudo postmap hash:/etc/postfix/$vm_domainname/smtpd/relay_clientcerts
 	sudo install -m 660 -o root -g root \
-	  etc/postfix/$vm_domainname/transport \
-	 /etc/postfix/$vm_domainname/transport
+	 "$tool"/etc/postfix/$vm_domainname/transport \
+	        /etc/postfix/$vm_domainname/transport
 	sudo postmap hash:/etc/postfix/$vm_domainname/transport
 	sudo install -m 660 -o root -g root \
-	  etc/postfix/$vm_domainname/virtual_alias \
-	 /etc/postfix/$vm_domainname/virtual_alias
+	 "$tool"/etc/postfix/$vm_domainname/virtual_alias \
+	        /etc/postfix/$vm_domainname/virtual_alias
 	sudo postmap hash:/etc/postfix/$vm_domainname/virtual_alias
 	sudo service postfix restart
  }
@@ -652,11 +652,11 @@ rule_user_configure () {
 		  'case \$(/usr/bin/passwd --status "\$SUDO_USER") in ("\$SUDO_USER L "*) /usr/bin/passwd \$SUDO_USER;; esac'
 		EOF
 	sudo install -m 644 -o root -g root \
-	  etc/bash.bashrc \
-	 /etc/bash.bashrc
+	 "$tool"/etc/bash.bashrc \
+	        /etc/bash.bashrc
 	sudo install -m 644 -o root -g root \
-	  etc/screenrc \
-	 /etc/screenrc
+	 "$tool"/etc/screenrc \
+	        /etc/screenrc
  }
 rule_user_root_configure () {
 	sudo install -d -m 750 -o root -g adm \
-- 
2.20.1