From 864e6d12b636274e2e0e0f2c64924554c5184312 Mon Sep 17 00:00:00 2001 From: erdgeist Date: Mon, 2 Jan 2012 04:54:05 +0000 Subject: Some more subtle changes in the new release directory structure --- ezjail-admin | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ezjail-admin') diff --git a/ezjail-admin b/ezjail-admin index 2ca46aa..54d2654 100755 --- a/ezjail-admin +++ b/ezjail-admin @@ -966,7 +966,8 @@ install) # From 9.0 releases come with a new layout # It is now a single archive ${pkg}.txz instead of a list of archive parts under ${pkg}/* # We assume for now that jail's platform is supposed to be that of the host. That may change later. - ezjail_release_major=${ezjail_release%%.} + ezjail_release_major=${ezjail_release%%.*} + [ ${ezjail_release_major} -ge 9 -a -n "${ezjail_installmanpages}" ] && ezjail_installmanpages=doc # Normally fulljail should be renamed by past ezjail-admin commands. # However those may have failed @@ -1001,7 +1002,7 @@ install) [ "${ezjail_ftpserverqueried}" ] || ezjail_queryftpserver exit 1 fi - if [${ezjail_release_major} -ge 9 ]; then + if [ ${ezjail_release_major} -ge 9 ]; then ftp "${ezjail_ftphost}:${ezjail_path}/${ezjail_installplatform}/${ezjail_installarch}/${ezjail_release}/${pkg}.txz" && break else ftp "${ezjail_ftphost}:${ezjail_path}/${ezjail_installarch}/${ezjail_release}/${pkg}/*" && break -- cgit v1.2.3