mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-09 22:16:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #485 from marineam/sdk

Browse Source 
common: set properly COREOS_SDK_VERSION
This commit is contained in:
Michael Marineau 2015-12-01 12:50:34 -08:00
commit a20129cafb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common.sh
View File

@ -242,10 +242,12 @@ load_environment_whitelist() {
} }
load_environment_var() { load_environment_var() {
local file="$1" name="$2" local file="$1" name value
local value shift
for name in "$@"; do
value=$(grep "^${name}=" "${file}") value=$(grep "^${name}=" "${file}")
export "${value}" export "${value}"
done
} }
# Find root of source tree # Find root of source tree
@ -273,13 +275,14 @@ REPO_MANIFESTS_DIR="${REPO_ROOT}/.repo/manifests"
# Source COREOS_VERSION_ID from manifest. # Source COREOS_VERSION_ID from manifest.
if [[ -f "${REPO_MANIFESTS_DIR}/version.txt" ]]; then if [[ -f "${REPO_MANIFESTS_DIR}/version.txt" ]]; then
load_environment_var "${REPO_MANIFESTS_DIR}/version.txt" COREOS_VERSION_ID load_environment_var "${REPO_MANIFESTS_DIR}/version.txt" \
COREOS_VERSION_ID COREOS_SDK_VERSION
# The build id may be provided externally by the build system. # The build id may be provided externally by the build system.
: ${COREOS_BUILD_ID:=$(date +%Y-%m-%d-%H%M)} : ${COREOS_BUILD_ID:=$(date +%Y-%m-%d-%H%M)}
elif [[ -f "${SCRIPT_LOCATION}/version.txt" ]]; then elif [[ -f "${SCRIPT_LOCATION}/version.txt" ]]; then
load_environment_var "${SCRIPT_LOCATION}/version.txt" COREOS_VERSION_ID
# This only happens in update.zip where we must use the current build id. # This only happens in update.zip where we must use the current build id.
load_environment_var "${SCRIPT_LOCATION}/version.txt" COREOS_BUILD_ID load_environment_var "${SCRIPT_LOCATION}/version.txt" \
COREOS_VERSION_ID COREOS_BUILD_ID COREOS_SDK_VERSION
else else
die "Unable to locate version.txt" die "Unable to locate version.txt"
fi fi