File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -2528,13 +2528,15 @@ function getValueFromModuleSettingsFile () {
25282528
25292529 settings_file_used=" "
25302530
2531- if [ " $edgeDevice " != " " ] && [ " $dev_specifier " != " " ]; then
2532- moduleSettingValue=$( getValueFromModuleSettings " ${moduleDirPath} /modulesettings.${edgeDevice} .${dev_specifier} .json" " ${moduleId} " " ${property} " )
2533- if [ " ${moduleSettingValue} " != " " ]; then settings_file_used=" modulesettings.${edgeDevice} .${dev_specifier} .json" ; fi
2531+ # NOTE: edgeDevice would be "Raspberry Pi" (or blank if non-edge) and platform would be "raspberrypi"
2532+
2533+ if [ " $platform " != " " ] && [ " $dev_specifier " != " " ]; then
2534+ moduleSettingValue=$( getValueFromModuleSettings " ${moduleDirPath} /modulesettings.${platform} .${dev_specifier} .json" " ${moduleId} " " ${property} " )
2535+ if [ " ${moduleSettingValue} " != " " ]; then settings_file_used=" modulesettings.${platform} .${dev_specifier} .json" ; fi
25342536 fi
2535- if [ " $edgeDevice " != " " ]; then
2536- moduleSettingValue=$( getValueFromModuleSettings " ${moduleDirPath} /modulesettings.${edgeDevice } .json" " ${moduleId} " " ${property} " )
2537- if [ " ${moduleSettingValue} " != " " ]; then settings_file_used=" modulesettings.${edgeDevice } .json" ; fi
2537+ if [ " $platform " != " " ]; then
2538+ moduleSettingValue=$( getValueFromModuleSettings " ${moduleDirPath} /modulesettings.${platform } .json" " ${moduleId} " " ${property} " )
2539+ if [ " ${moduleSettingValue} " != " " ]; then settings_file_used=" modulesettings.${platform } .json" ; fi
25382540 fi
25392541 if [ " ${moduleSettingValue} " = " " ] && [ " $dev_specifier " != " " ]; then
25402542 moduleSettingValue=$( getValueFromModuleSettings " ${moduleDirPath} /modulesettings.${os} .${architecture} .${dev_specifier} .json" " ${moduleId} " " ${property} " )
You can’t perform that action at this time.
0 commit comments