ruben/ezjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some more subtle changes in the new release directory structure

Browse Source
This commit is contained in:
erdgeist 2012-01-02 04:54:05 +00:00
parent fe8e579fef
commit 864e6d12b6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ezjail-admin
View File

@ -966,7 +966,8 @@ install)
# From 9.0 releases come with a new layout # 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}/* # 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. # 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. # Normally fulljail should be renamed by past ezjail-admin commands.
# However those may have failed # However those may have failed
@ -1001,7 +1002,7 @@ install)
[ "${ezjail_ftpserverqueried}" ] || ezjail_queryftpserver [ "${ezjail_ftpserverqueried}" ] || ezjail_queryftpserver
exit 1 exit 1
fi 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 ftp "${ezjail_ftphost}:${ezjail_path}/${ezjail_installplatform}/${ezjail_installarch}/${ezjail_release}/${pkg}.txz" && break
else else
ftp "${ezjail_ftphost}:${ezjail_path}/${ezjail_installarch}/${ezjail_release}/${pkg}/*" && break ftp "${ezjail_ftphost}:${ezjail_path}/${ezjail_installarch}/${ezjail_release}/${pkg}/*" && break