diff --git a/dmctl b/dmctl index 6395a06..059fb39 100755 --- a/dmctl +++ b/dmctl @@ -8,6 +8,7 @@ function display_help() { USAGE $scriptname -d NAME $scriptname -l ARCHIVE + $scriptname -a ARCHIVEs... OPTIONS -d, --dump @@ -131,12 +132,17 @@ case "$action" in dump) dump_machine "$1";; load) load_machine "$1";; loadall) - if [ $# -gt 0 ]; then - archives=("$@") - else - NOCLOBBER=1 - array_lsfiles archives . "*-machine.tar.gz" - fi + [ $# -gt 0 ] || set -- . + archives=() + for file in "$@"; do + if [ -d "$file" ]; then + NOCLOBBER=1 + array_lsfiles files "$file" "*-machine.tar.gz" + array_extend archives files + else + archives+=("$file") + fi + done for archive in "${archives[@]}"; do etitle "$archive" load_machine "$archive"