update: list_files to copy all DHCP_CONFS..
--- a/bin/update Thu Mar 22 16:36:12 2012 +0200
+++ b/bin/update Fri Mar 23 15:10:23 2012 +0200
@@ -101,8 +101,8 @@
# List of actual domains used; will be linked to $DOMAIN_BASE
DOMAINS=(paivola.fi paivola.net paivola.org paivola.info paivola.mobi xn--pivl-load8j.fi)
-# Names of dhcp conf files
-DHCP_CONFS=(paivola veturi verstas)
+# Names of dhcp conf file names
+DHCP_CONFS=( $(list_files $DHCP_DATA *.conf) )
## Operate!
# these functions are all defined in lib/update.operations
@@ -195,6 +195,8 @@
# Update $DHCP files from $DATA/dhcp
function run_dhcp {
+ log_debug "DHCP_CONFS: ${DHCP_CONFS[*]}"
+
log "Copying DHCP configs..."
for conf in "${DHCP_CONFS[@]}"; do
# conf base
--- a/lib/update.utils Thu Mar 22 16:36:12 2012 +0200
+++ b/lib/update.utils Fri Mar 23 15:10:23 2012 +0200
@@ -65,6 +65,24 @@
echo "$ROOT/$path"
}
+## List names of files in dir:
+#
+# list_files $dir $glob
+#
+function list_files {
+ local dir=$1
+ local glob=$2
+ local name=
+
+ for file in $dir/$glob; do
+ # strip prefix
+ name=${file#$dir/}
+ name=${name%$glob}
+
+ echo -n "$name "
+ done
+}
+
### HG wrappers
# Run `hg ...` within $REPO.
function hg {