opensourcemirror
/
opnsense-tools
mirror of https://github.com/opnsense/tools.git
1
0
Fork 0
Code Issues Releases Wiki Activity

build/test: install globs as well 

Still stalls in template regeneration, needs some thinking.
This commit is contained in:
Franco Fichtner 2017-08-21 09:35:06 +02:00
parent 7e01d1eef5
commit e571bac057
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/common.sh
View File

@ -602,16 +602,12 @@ install_packages()
PKGFOUND=
for PKGFILE in $({
cd ${BASEDIR}
find .${PACKAGESDIR}/All -name "${PKG}-*.txz"
find .${PACKAGESDIR}/All -name "${PKG}-[0-9]*.txz"
}); do
PKGINFO=$(pkg -c ${BASEDIR} info -F ${PKGFILE} | grep ^Name | awk '{ print $3; }')
if [ ${PKG} = ${PKGINFO} ]; then
PKGFOUND=${PKGFILE}
fi
pkg -c ${BASEDIR} add ${PKGFILE}
PKGFOUND=1
done
if [ -n "${PKGFOUND}" ]; then
pkg -c ${BASEDIR} add ${PKGFOUND}
else
if [ -z "${PKGFOUND}" ]; then
echo "Could not find package: ${PKG}" >&2
exit 1
fi

2
build/test.sh
View File

@ -41,7 +41,7 @@ setup_clone ${STAGEDIR} ${PLUGINSDIR}
setup_chroot ${STAGEDIR}
extract_packages ${STAGEDIR}
install_packages ${STAGEDIR} pkg pear-PHP_CodeSniffer phpunit6 ${PRODUCT_PKGNAME}
install_packages ${STAGEDIR} pkg ${PRODUCT_PKGNAME} "os-*${PRODUCT_SUFFIX}"
# don't want to deinstall in case of testing...
echo ">>> Running ${PLUGINSDIR} test suite..."