libraries/proxyface
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix installation check after package build

Browse Source
This commit is contained in:
Marc Wäckerlin
2018-09-11 10:21:16 +00:00
parent ed44b3f321
commit 8090e269c6
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
COPYING
View File

@@ -1 +1 @@
/usr/share/automake-1.15/COPYING /usr/share/automake-1.13/COPYING

2
INSTALL
View File

@@ -1 +1 @@
/usr/share/automake-1.15/INSTALL /usr/share/automake-1.13/INSTALL

11
build-in-docker.sh
View File

@@ -344,12 +344,13 @@ done
docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}" ${host} "${FLAGS[@]}" docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}" ${host} "${FLAGS[@]}"
# last check: try to install built deb or rpm files (if not already cleaned up) # last check: try to install built deb or rpm files (if not already cleaned up)
if test "${targets//deb/}" != "${targets}"; then # not supported in trusty and jessie
if ls *.deb > /dev/null 2> /dev/null; then if test "$mode" = deb -a "${img//trusty/}" = "${img}" -a "${img//jessie/}" = "${img}"; then
docker exec ${DOCKER_ID} bash -c "apt-get install ${OPTIONS} ${PREVENT} /workdir/*.deb" if test "${targets//deb/}" != "${targets}" && ls *.deb > /dev/null 2> /dev/null; then
fi docker exec ${DOCKER_ID} bash -c "apt-get install ${OPTIONS} ${PREVENT} /workdir/*.deb"
fi
fi fi
if test "${targets//rpm/}" != "${targets}"; then if test "$mode" = rpm -a "${targets//rpm/}" != "${targets}"; then
if ls *.rpm > /dev/null 2> /dev/null; then if ls *.rpm > /dev/null 2> /dev/null; then
docker exec ${DOCKER_ID} bash -c "${INSTALL_TOOL} /workdir/*.rpm" docker exec ${DOCKER_ID} bash -c "${INSTALL_TOOL} /workdir/*.rpm"
fi fi