enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

main-config: allow using REVISION from env or command-line param; ensure it begins with digit

Browse Source
This commit is contained in:
Ricardo Pardini 2023-08-04 17:55:29 +02:00 committed by Igor
parent 2142f73b97
commit be11e171a8
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/functions/configuration/main-config.sh
View File

@ -21,17 +21,22 @@ function do_main_configuration() {
declare -g -r PACKAGE_LIST_DESKTOP
# common options
declare revision_from="undetermined"
if [ -f "${USERPATCHES_PATH}"/VERSION ]; then
REVISION=$(cat "${USERPATCHES_PATH}"/VERSION)
revision_from="userpatches VERSION file"
else
REVISION=$(cat "${SRC}"/VERSION)
revision_from="main VERSION file"
declare revision_from="set in env or command-line parameter"
if [[ "${REVISION}" == "" ]]; then
if [ -f "${USERPATCHES_PATH}"/VERSION ]; then
REVISION=$(cat "${USERPATCHES_PATH}"/VERSION)
revision_from="userpatches VERSION file"
else
REVISION=$(cat "${SRC}"/VERSION)
revision_from="main VERSION file"
fi
fi
declare -g -r REVISION="${REVISION}"
display_alert "Using revision from" "${revision_from}: '${REVISION}'" "info"
display_alert "Using REVISION from" "${revision_from}: '${REVISION}'" "info"
if [[ ! "${REVISION}" =~ ^[0-9] ]]; then
exit_with_error "REVISION must begin with a digit, got '${REVISION}'"
fi
[[ -z $VENDOR ]] && VENDOR="Armbian"
[[ -z $VENDORURL ]] && VENDORURL="https://www.armbian.com"