diff options
-rwxr-xr-x | ezjail-admin | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ezjail-admin b/ezjail-admin index 21de648..10ca384 100755 --- a/ezjail-admin +++ b/ezjail-admin | |||
@@ -972,6 +972,8 @@ install) | |||
972 | echo "Note: From FreeBSD 9.0 man pages are part of the base package" | 972 | echo "Note: From FreeBSD 9.0 man pages are part of the base package" |
973 | unset ezjail_installmanpages | 973 | unset ezjail_installmanpages |
974 | fi | 974 | fi |
975 | [ ${ezjail_release_major} -ge 9 ] && ezjail_installarch="${ezjail_installplatform}/${ezjail_installarch}" | ||
976 | [ ${ezjail_release_major} -ge 9 ] && ezjail_pkgsuffix=".txz" || ezjail_pkgsuffix="/*" | ||
975 | 977 | ||
976 | # Normally fulljail should be renamed by past ezjail-admin commands. | 978 | # Normally fulljail should be renamed by past ezjail-admin commands. |
977 | # However those may have failed | 979 | # However those may have failed |
@@ -1006,11 +1008,7 @@ install) | |||
1006 | [ "${ezjail_ftpserverqueried}" ] || ezjail_queryftpserver | 1008 | [ "${ezjail_ftpserverqueried}" ] || ezjail_queryftpserver |
1007 | exit 1 | 1009 | exit 1 |
1008 | fi | 1010 | fi |
1009 | if [ ${ezjail_release_major} -ge 9 ]; then | 1011 | ftp "${ezjail_ftphost}:${ezjail_path}/${ezjail_installarch}/${ezjail_release}/${pkg}${ezjail_pkgsuffix}" && break |
1010 | ftp "${ezjail_ftphost}:${ezjail_path}/${ezjail_installplatform}/${ezjail_installarch}/${ezjail_release}/${pkg}.txz" && break | ||
1011 | else | ||
1012 | ftp "${ezjail_ftphost}:${ezjail_path}/${ezjail_installarch}/${ezjail_release}/${pkg}/*" && break | ||
1013 | fi | ||
1014 | done | 1012 | done |
1015 | 1013 | ||
1016 | if [ ${ezjail_release_major} -ge 9 ]; then | 1014 | if [ ${ezjail_release_major} -ge 9 ]; then |