CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-06 16:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Apply fixes for convert-file script (#5206)

Browse Source
This commit is contained in:
Monica Kozbial
2021-07-23 18:10:38 -07:00
committed by GitHub
parent d2efb59358
commit 1360b5bb49
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/goog_module/convert-file.sh
View File

@@ -190,20 +190,27 @@ step3() {
local comma_properties=$(echo "${properties_accessed}" | perl -pe 's/\s+/, /g' | perl -pe 's/, $//')
inf "Detected references of ${require}: ${comma_properties}"
for require_prop in echo "${properties_accessed}"; do
for require_prop in $(echo "${properties_accessed}"); do
inf "Updating references of ${require}.${require_prop} to ${require_name}.${require_prop}..."
perl -pi -e 's/'"${require}"'\.'"${require_prop}"'([^'\''\w])/'"${require_name}"'\.'"${require_prop}"'\1/g' "${filepath}"
perl -pi -e 's/'"${require}"'\.'"${require_prop}"'(?!\w)/'"${require_name}"'\.'"${require_prop}"'/g' "${filepath}"
done
fi
inf "Updating direct references of ${require} to ${require_name}..."
perl -pi -e 's/'"${require}"'([^'\''\w]\.)/'"${require_name}"'\1/g' "${filepath}"
perl -pi -e 's/'"${require}"'(?!['\''\w\.])/'"${require_name}"'/g' "${filepath}"
done
local missing_requires=$(perl -nle'print $& while m{(?<!'\'')Blockly(\.\w+)+}g' "${filepath}")
missing_requires=$(echo "${missing_requires}" | tr ' ' '\n' | sort -u)
if [[ -n "${missing_requires}" ]]; then
err "Missing requires for:\n${missing_requires}\nPlease manually fix."
# Search for the string goog.require('Blockly') or goog.requireType('Blockly')
local has_blockly_require=$(perl -ne'print m{goog\.(require|requireType)\('\''Blockly'\''\)}g' "${filepath}")
if [[ -n "${has_blockly_require}" ]]; then
warn 'Blockly detected as a require.'
warn "Potentially missing requires for:\n${missing_requires}\nPlease manually review."
else
err "Missing requires for:\n${missing_requires}\nPlease manually fix."
fi
fi
success "Completed automation for step 3. Please manually review and reorder requires."