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

Utilisation d'une image 32bit par défaut si aucune image spécifiée pour les targets i*86

This commit is contained in:
wpetit 2016-02-16 14:17:22 +01:00
parent 116733dea8
commit 8bc0d15df6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package
View File

@ -5,6 +5,8 @@ set -e
TAMARIN_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) TAMARIN_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
BASE_DIR="$TAMARIN_DIR" source "$TAMARIN_DIR/lib/util.sh" BASE_DIR="$TAMARIN_DIR" source "$TAMARIN_DIR/lib/util.sh"
DEFAULT_64_IMAGE="debian:jessie"
DEFAULT_32_IMAGE="32bit/debian:jessie"
function show_usage { function show_usage {
echo echo
@ -156,11 +158,17 @@ done
[[ -z ${PROJECT_PATH} ]] && show_usage [[ -z ${PROJECT_PATH} ]] && show_usage
[[ -z ${PROJECT_DEST} ]] && PROJECT_DEST=$(readlink -f "./packages") [[ -z ${PROJECT_DEST} ]] && PROJECT_DEST=$(readlink -f "./packages")
[[ -z ${BASE_IMAGE} ]] && BASE_IMAGE="debian:jessie"
[[ -z ${BUILD_BRANCH} ]] && BUILD_BRANCH="dist/ubuntu/precise/master" [[ -z ${BUILD_BRANCH} ]] && BUILD_BRANCH="dist/ubuntu/precise/master"
[[ -z ${PERSIST_CONTAINER} ]] && PERSIST_CONTAINER=0 [[ -z ${PERSIST_CONTAINER} ]] && PERSIST_CONTAINER=0
[[ -z ${TARGET_ARCH} ]] && TARGET_ARCH=amd64 [[ -z ${TARGET_ARCH} ]] && TARGET_ARCH=amd64
if [[ "${TARGET_ARCH}" =~ ^i[0-9]86$ ]] && [ -z "${BASE_IMAGE}" ]; then
info "32bit architecture specified and no specific image given, switching to 32bit image..."
BASE_IMAGE=${DEFAULT_32_IMAGE}
fi
[[ -z ${BASE_IMAGE} ]] && BASE_IMAGE=${DEFAULT_64_IMAGE}
# #
# Warn user about "proxy" # Warn user about "proxy"
# #