# HG changeset patch
# User Tero Marttila <tero.marttila@aalto.fi>
# Date 1425053252 -7200
# Node ID 8069b08e90ac1c8e52f54a6cf6ca83dd5b60104a
# Parent  28c17b099420c38615fe534b244570b287e4aa78
bin/update: fixup relative/absolute paths

diff -r 28c17b099420 -r 8069b08e90ac bin/update
--- a/bin/update	Fri Feb 27 17:56:16 2015 +0200
+++ b/bin/update	Fri Feb 27 18:07:32 2015 +0200
@@ -1,10 +1,12 @@
 #!/bin/bash
 
-SRV=${SRV:-.}
-SRC=${OPT:-.}
+# absolute path to directory with etc/ and var/
+SRV=${SRV:-$(pwd)}
+
+# path (relative to $SRV) to directory with bin/
 OPT=${OPT:-./opt}
-ETC=${ETC:-$SRV/etc}
-LIB=${LIB:-$SRC/lib}
-VAR=${VAR:-$SRV/var}
+
+# path (relative to $SRV) to lib/ directory with pvl/
+LIB=${LIB:-./lib}
 
 . $LIB/pvl/hosts/update.sh
diff -r 28c17b099420 -r 8069b08e90ac lib/pvl/hosts/update.sh
--- a/lib/pvl/hosts/update.sh	Fri Feb 27 17:56:16 2015 +0200
+++ b/lib/pvl/hosts/update.sh	Fri Feb 27 18:07:32 2015 +0200
@@ -40,19 +40,19 @@
 }
 
 function update_setup {
-    for dir in $ETC $ETC/zones $ETC/hosts; do
+    for dir in etc etc/zones etc/hosts; do
         [ -d $dir ] || die "$dir: missing source directory"
     done
     
-    apply_dir       $VAR
+    apply_dir       var
 
-    for dir in $VAR/dhcp $VAR/zones $VAR/include-cache $VAR/serials; do
+    for dir in var/dhcp var/zones var/include-cache var/serials; do
         apply_dir   $dir
     done
-    for dir in $VAR/dhcp/hosts; do
+    for dir in var/dhcp/hosts; do
         apply_dir   $dir
     done
-    for dir in $VAR/zones/includes $VAR/zones/forward $VAR/zones/reverse; do
+    for dir in var/zones/includes var/zones/forward var/zones/reverse; do
         apply_dir   $dir
     done
 }
diff -r 28c17b099420 -r 8069b08e90ac lib/pvl/hosts/zone.sh
--- a/lib/pvl/hosts/zone.sh	Fri Feb 27 17:56:16 2015 +0200
+++ b/lib/pvl/hosts/zone.sh	Fri Feb 27 18:07:32 2015 +0200
@@ -1,7 +1,8 @@
 #HOSTS_CHARSET='utf-8'
-HOSTS_INCLUDE="$ETC/hosts"
+HOSTS_INCLUDE="etc/hosts"
 
-ZONES_INCLUDE="$VAR/zones"
+# absolute path!
+ZONES_INCLUDE="$SRV/var/zones"
 
 NAMED_CHECKZONE=/usr/sbin/named-checkzone
 
diff -r 28c17b099420 -r 8069b08e90ac lib/pvl/main.sh
--- a/lib/pvl/main.sh	Fri Feb 27 17:56:16 2015 +0200
+++ b/lib/pvl/main.sh	Fri Feb 27 18:07:32 2015 +0200
@@ -71,5 +71,8 @@
 
     func_test ${MODULE_MAIN}_init && ${MODULE_MAIN}_init
 
+    # initialize relative paths
+    [ -z "$SRV" ] || cd $SRV
+
     ${MODULE_MAIN}_main
 }