--- a/bin/update	Tue Mar 20 12:06:31 2012 +0200
+++ b/bin/update	Tue Mar 20 12:08:38 2012 +0200
@@ -19,9 +19,6 @@
 
 # bin dir
 BIN=$(dirname $self)
-PROCESS_ZONE=$BIN/process-zone
-EXPAND_ZONE=$BIN/expand-zone
-UPDATE_SERIAL=$BIN/update-serial
 
 # data files
 DATA=settings
@@ -395,7 +392,7 @@
         log_info "Generating hosts $zone <- $base..."
 
         do_update $zone \
-            $PROCESS_ZONE $PROCESS_ARGS $ROOT/$base "$@"
+            $BIN/process-zone $PROCESS_ARGS $ROOT/$base "$@"
     else
         log_info "Generating hosts $zone <- $base: not changed"
     fi
@@ -412,7 +409,7 @@
 
     log_info "Updating $serial..."
 
-    cmd $UPDATE_SERIAL $* $ROOT/$serial
+    cmd $BIN/update-serial $* $ROOT/$serial
     
     local new=$(cat $ROOT/$serial)
         
@@ -473,7 +470,7 @@
         log_info "Generating $out <- $src..." 
 
         do_update $out \
-            $EXPAND_ZONE $ROOT/$src                 \
+            $BIN/expand-zone $ROOT/$src \
                 --serial $ROOT/$serial              \
                 --expand zones=$(abspath $ZONES)    \
                 --expand view=$view
@@ -508,7 +505,7 @@
 function check_hosts {
     local hosts=$1; shift 1
 
-    local cmd=($PROCESS_ZONE $PROCESS_ARGS $ROOT/$hosts --check-hosts "$@")
+    local cmd=($BIN/process-zone $PROCESS_ARGS $ROOT/$hosts --check-hosts "$@")
 
     if "${cmd[@]}" -q; then
         log_info "Check $hosts: OK"