diff -r 7da14a2549f7 -r b0c0e3e80c39 bin/update --- a/bin/update Tue Feb 19 11:37:40 2013 +0200 +++ b/bin/update Tue Feb 19 13:58:22 2013 +0200 @@ -15,24 +15,22 @@ fi done -# Our bin dir, with scripts -BIN=$(dirname $self) +# root dir +ROOT=$(dirname $(dirname $self)) -# code root -CODE=$(dirname $BIN) - -# library code -LIB=$CODE/lib +BIN=$ROOT/bin +LIB=$ROOT/lib +VAR=$ROOT/var ## Data paths # absolute path to data files; can be changed using -d ROOT=$(pwd) DATA=settings -ZONES=zones -SERIALS=$DATA +ZONES=$VAR/zones +SERIALS=$VAR/serials -DHCP=dhcp +DHCP=$VAR/dhcp DHCP_DATA=$DATA/dhcp # global DHCP conf to test @@ -259,10 +257,11 @@ [ -d $ROOT/$DATA ] || die "Missing data: $ROOT/$DATA" ## Output dirs - for dir in $DHCP $ZONES; do + for dir in $VAR $DHCP $ZONES $SERIALS; do ensure_dir $dir done - + + # sub-$ZONES for dir in "common" "hosts" "includes" "${VIEWS[@]}"; do ensure_dir $ZONES/$dir done