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

Try to unify installarch and installplatform so that query_ftp_server can work with it, too

Browse Source
This commit is contained in:
erdgeist 2012-01-04 18:17:47 +00:00
parent e03bda252e
commit d2e5306669
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ezjail-admin
View File

@ -972,6 +972,8 @@ install)
echo "Note: From FreeBSD 9.0 man pages are part of the base package" echo "Note: From FreeBSD 9.0 man pages are part of the base package"
unset ezjail_installmanpages unset ezjail_installmanpages
fi fi
[ ${ezjail_release_major} -ge 9 ] && ezjail_installarch="${ezjail_installplatform}/${ezjail_installarch}"
[ ${ezjail_release_major} -ge 9 ] && ezjail_pkgsuffix=".txz" || ezjail_pkgsuffix="/*"
# 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
@ -1006,11 +1008,7 @@ install)
[ "${ezjail_ftpserverqueried}" ] || ezjail_queryftpserver [ "${ezjail_ftpserverqueried}" ] || ezjail_queryftpserver
exit 1 exit 1
fi fi
if [ ${ezjail_release_major} -ge 9 ]; then ftp "${ezjail_ftphost}:${ezjail_path}/${ezjail_installarch}/${ezjail_release}/${pkg}${ezjail_pkgsuffix}" && break
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
fi
done done
if [ ${ezjail_release_major} -ge 9 ]; then if [ ${ezjail_release_major} -ge 9 ]; then