Skip to content

Commit e50e1f6

Browse files
committed
check_library_properties: Use standardized environment variable name
I've retained the definition of the non-standard variable name for backwards compatibility.
1 parent b49db95 commit e50e1f6

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ matrix:
8282
- cd ..
8383
- git clone https://github.com/per1234/arduino-ci-script-tests
8484
- cd arduino-ci-script-tests
85-
- git checkout a3745f44577648bb34c3784ed564535d8196bcf7
85+
- git checkout 573daca37f80a720b9e097de21ddc7d69c0b46f4
8686
script:
8787
- bats check_keywords_txt.bats
8888
- bats check_library_manager_compliance.bats

arduino-ci-script.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1596,7 +1596,9 @@ function check_field_name_case() {
15961596
ARDUINO_CI_SCRIPT_EXIT_STATUS_COUNTER=1
15971597
readonly ARDUINO_CI_SCRIPT_CHECK_LIBRARY_PROPERTIES_REDUNDANT_PARAGRAPH_EXIT_STATUS=$ARDUINO_CI_SCRIPT_EXIT_STATUS_COUNTER
15981598
ARDUINO_CI_SCRIPT_EXIT_STATUS_COUNTER=$((ARDUINO_CI_SCRIPT_EXIT_STATUS_COUNTER + 1))
1599-
readonly ARDUINO_CI_SCRIPT_CHECK_LIBRARY_PROPERTIES_BLANK_NAME=$ARDUINO_CI_SCRIPT_EXIT_STATUS_COUNTER
1599+
readonly ARDUINO_CI_SCRIPT_CHECK_LIBRARY_PROPERTIES_BLANK_NAME_EXIT_STATUS=$ARDUINO_CI_SCRIPT_EXIT_STATUS_COUNTER
1600+
# For backwards compatibility. Some releases of arduino-ci-script used this variable name that didn't follow the standard form.
1601+
readonly ARDUINO_CI_SCRIPT_CHECK_LIBRARY_PROPERTIES_BLANK_NAME=$ARDUINO_CI_SCRIPT_CHECK_LIBRARY_PROPERTIES_BLANK_NAME_EXIT_STATUS
16001602
ARDUINO_CI_SCRIPT_EXIT_STATUS_COUNTER=$((ARDUINO_CI_SCRIPT_EXIT_STATUS_COUNTER + 1))
16011603
readonly ARDUINO_CI_SCRIPT_CHECK_LIBRARY_PROPERTIES_INVALID_ARCHITECTURE_EXIT_STATUS=$ARDUINO_CI_SCRIPT_EXIT_STATUS_COUNTER
16021604
ARDUINO_CI_SCRIPT_EXIT_STATUS_COUNTER=$((ARDUINO_CI_SCRIPT_EXIT_STATUS_COUNTER + 1))
@@ -1721,7 +1723,7 @@ function check_library_properties() {
17211723
# Check for blank name value
17221724
if [[ "$nameValue" == "" ]]; then
17231725
echo "ERROR: ${normalizedLibraryPropertiesPath}/library.properties: Has an undefined name field."
1724-
exitStatus=$(set_exit_status "$exitStatus" $((ARDUINO_CI_SCRIPT_CHECK_LIBRARY_PROPERTIES_BLANK_NAME + checkFolderNameExitStatus)))
1726+
exitStatus=$(set_exit_status "$exitStatus" $((ARDUINO_CI_SCRIPT_CHECK_LIBRARY_PROPERTIES_BLANK_NAME_EXIT_STATUS + checkFolderNameExitStatus)))
17251727
else
17261728
# Check for invalid name value
17271729
# Library Manager installs libraries to a folder that is the name field value with any spaces replaced with _

0 commit comments

Comments
 (0)