summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2012-01-02 05:03:13 +0000
committererdgeist <erdgeist@erdgeist.org>2012-01-02 05:03:13 +0000
commit7a817c42e7fcb6217ed2afa035f72af4f5b369a5 (patch)
tree305964d9a184492dd603198d33798491fa8e80a9
parent864e6d12b636274e2e0e0f2c64924554c5184312 (diff)
Older bsdtar version can't decompress on the fly. Use xzdec instead
-rwxr-xr-xezjail-admin4
1 files changed, 2 insertions, 2 deletions
diff --git a/ezjail-admin b/ezjail-admin
index 54d2654..1a98e15 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -1010,7 +1010,7 @@ install)
1010 done 1010 done
1011 1011
1012 if [ ${ezjail_release_major} -ge 9 ]; then 1012 if [ ${ezjail_release_major} -ge 9 ]; then
1013 tar --unlink -xpJf -C ${DESTDIR} ${pkg}.txz 1013 xzdec ${pkg}.txz | tar --unlink -xpJf - -C ${DESTDIR}
1014 else 1014 else
1015 # These actions are really ugly: sources want $1 to contain the set 1015 # These actions are really ugly: sources want $1 to contain the set
1016 # of sources to install, base asks the user if he is sure, hence the 1016 # of sources to install, base asks the user if he is sure, hence the
@@ -1025,7 +1025,7 @@ install)
1025 else 1025 else
1026 if [ ${ezjail_release_major} -ge 9 ]; then 1026 if [ ${ezjail_release_major} -ge 9 ]; then
1027 [ -r "${ezjail_reldir}/${ezjail_dir}/${pkg}.txz" ] || exerr "Error: Can not access package file ${ezjail_reldir}/${ezjail_dir}/${pkg}.txz" 1027 [ -r "${ezjail_reldir}/${ezjail_dir}/${pkg}.txz" ] || exerr "Error: Can not access package file ${ezjail_reldir}/${ezjail_dir}/${pkg}.txz"
1028 tar --unlink -xpJf -C ${DESTDIR} ${ezjail_reldir}/${ezjail_dir}/${pkg}.txz 1028 xzdec $ ${ezjail_reldir}/${ezjail_dir}/${pkg}.txz | tar --unlink -xpJf - -C ${DESTDIR}
1029 else 1029 else
1030 cd "${ezjail_reldir}/${ezjail_dir}/${pkg}" || exerr "Error: Could not cd to ${ezjail_dir}." 1030 cd "${ezjail_reldir}/${ezjail_dir}/${pkg}" || exerr "Error: Could not cd to ${ezjail_dir}."
1031 [ "${pkg}" = "base" ] && echo "Ignore the next question, ezjail answers it for you." 1031 [ "${pkg}" = "base" ] && echo "Ignore the next question, ezjail answers it for you."