Allow for specifying - as filename if archiving to stdout is desired.

1 files changed, 7 insertions, 5 deletions

diff --git a/ezjail-admin b/ezjail-admin
index f1a5b0c..5fa2f6a 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -826,16 +826,18 @@ archive)
     [ "${ezjail_archive}" ] || ezjail_archive="${ezjail_archive_tag}.tar.gz"
 
     # if archive location is not absolute, prepend archive directory
-    [ "${ezjail_archive%%[!/]*}" ] || ezjail_archive="${ezjail_archivedir}/${ezjail_archive}"
+    [ "${ezjail_archive%%[!/]*}" -a ${ezjail_archive} != "-" ] || ezjail_archive="${ezjail_archivedir}/${ezjail_archive}"
 
     # It's a tar archive, after all
     case ${ezjail_archive} in
-      *.tar.gz|*.tgz) ;;
-      *) ezjail_archive="${ezjail_archive}.tar.gz" ;;
-    esac;
+      -) unset ezjail_archive_opt;;
+      *) ezjail_archive="${ezjail_archive}.tar.gz"
+    # Fall through intended
+      *.tar.gz|*.tgz) ezjail_archive_opt="-f ${ezjail_archive}";;
+    esac
 
     cd "${ezjail_rootdir}" || exerr "Error: can't cd to ${ezjail_root}."
-    pax -wXtz -x ustar -f "${ezjail_archive}" \
+    pax -wXtz -x ustar "${ezjail_archive_opt}" \
       -s:"^[^\\.].*/ezjail\\.conf\$":ezjail.conf: \
       -s:"^[^\\.].*/${ezjail_safename}\$":prop.ezjail_${ezjail_archive_tag}: \
       -s:"^[^\\.].*/${ezjail_safename}.norun\$":prop.ezjail_${ezjail_archive_tag}.norun: \