Merge pull request #6478 from heitbaum/functions11

[le11] config/functions: improve error message when there in not a device directory
This commit is contained in:
CvH 2022-05-19 12:32:59 +02:00 committed by GitHub
commit 00da8a8049
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -767,8 +767,15 @@ check_project() {
check_device() {
local dashes="===========================" device_err_msg
if [ \( -z "${DEVICE}" -a -d "${PROJECT_DIR}/${PROJECT}/devices" \) -o \
\( -n "${DEVICE}" -a ! -d "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}" \) ]; then
if [ -n "${DEVICE}" -a ! -d "${PROJECT_DIR}/${PROJECT}/devices" ]; then
device_err_msg="\n $dashes$dashes$dashes"
device_err_msg+="\n ERROR: You must not specify DEVICE for the $PROJECT project"
device_err_msg+="\n $dashes$dashes$dashes"
device_err_msg+="\n\n There are no devices for project: ${PROJECT}"
die "${device_err_msg}"
elif [ \( -z "${DEVICE}" -a -d "${PROJECT_DIR}/${PROJECT}/devices" \) -o \
\( -n "${DEVICE}" -a ! -d "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}" \) ]; then
device_err_msg="\n ${dashes}${dashes}${dashes}"
device_err_msg+="\n ERROR: Specify a valid device for the ${PROJECT} project"
device_err_msg+="\n ${dashes}${dashes}${dashes}"