Cadoles
/
Tamarin
21
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Wiki Activity

Correction passage arguments sur dpkg-buildpackage, fixes #1

This commit is contained in:
wpetit 2016-03-03 14:07:47 +01:00
parent 8bc0d15df6
commit c1073a210e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/build.sh
View File

@ -34,7 +34,7 @@ function build_project()
cd "${workspace}" cd "${workspace}"
dpkg-buildpackage -b -a "${TARGET_ARCH}" 2> >(stderr) 1> >(stdout) dpkg-buildpackage -b -a"${TARGET_ARCH}" 2> >(stderr) 1> >(stdout)
if [ $? != 0 ]; then if [ $? != 0 ]; then
fatal "The build process has not completed successfuly !" fatal "The build process has not completed successfuly !"

7
package
View File

@ -102,6 +102,11 @@ function main {
# Target architecture # Target architecture
docker_opt="${docker_opt} -e TARGET_ARCH=${TARGET_ARCH}" docker_opt="${docker_opt} -e TARGET_ARCH=${TARGET_ARCH}"
# If running in terminal, set docker to interactive
if [[ -t 1 ]]; then
docker_opt="${docker_opt} -it"
fi
if [[ ${PERSIST_CONTAINER} -eq 0 ]] if [[ ${PERSIST_CONTAINER} -eq 0 ]]
then then
docker_opt="${docker_opt} --rm " docker_opt="${docker_opt} --rm "
@ -163,7 +168,7 @@ done
[[ -z ${TARGET_ARCH} ]] && TARGET_ARCH=amd64 [[ -z ${TARGET_ARCH} ]] && TARGET_ARCH=amd64
if [[ "${TARGET_ARCH}" =~ ^i[0-9]86$ ]] && [ -z "${BASE_IMAGE}" ]; then if [[ "${TARGET_ARCH}" =~ ^i[0-9]86$ ]] && [ -z "${BASE_IMAGE}" ]; then
info "32bit architecture specified and no specific image given, switching to 32bit image..." info "32bit architecture specified and no specific image given, switching to default 32bit image..."
BASE_IMAGE=${DEFAULT_32_IMAGE} BASE_IMAGE=${DEFAULT_32_IMAGE}
fi fi