diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index a8145070a..bbd3949b8 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -215,7 +215,7 @@ jobs: steps: - name: Install dependencies (apk) - run: apk add --no-cache git + run: apk add --no-cache git bash grep - uses: actions/checkout@v4 with: @@ -227,4 +227,4 @@ jobs: run: git config --global --add safe.directory /__w/IronOS/IronOS && git config --global safe.directory "$GITHUB_WORKSPACE" - name: Check and verify documentation - run: /bin/sh ./scripts/deploy.sh docs + run: ./scripts/deploy.sh docs diff --git a/Makefile b/Makefile index 20453f4cc..c22f67183 100644 --- a/Makefile +++ b/Makefile @@ -149,7 +149,7 @@ test-md: @echo "" @echo "---- Checking documentation... ----" @echo "" - @/bin/sh ./scripts/deploy.sh docs + @./scripts/deploy.sh docs # shell style & linter check (github CI version of shellcheck is more recent than alpine one so the latter may not catch some policies) test-sh: diff --git a/Translations/translation_UZ.json b/Translations/translation_UZ.json index 97f8b9d62..244067895 100644 --- a/Translations/translation_UZ.json +++ b/Translations/translation_UZ.json @@ -137,7 +137,7 @@ "menuOptions": { "DCInCutoff": { "displayText": "Quvvat\nmanbai", - "description": "Batareya haddan tashqari zaryadsizlanishini oldini olish uchun kuchlanish chegarasini o'rnatish (DC 10V) (S=3.3V har bir yacheyka uchun, quvvat PWR chegarasini o'chirish)" + "description": "Batareya haddan tashqari zaryadsizlanishini oldini olish uchun kuchlanish chegarasini o'rnatish (DC 10V) (S=3.3V har bir yacheyka uchun, quvvat PWR chegarasini o'chirish)" }, "MinVolCell": { "displayText": "Minimal\nkuchlanish", diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 3f34e5b65..5ebd28df3 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -95,9 +95,10 @@ docs_links() { ver_git="$(git tag -l | sort | grep -e "^v" | grep -v "rc" | tail -1)" md="README.md" + test -f "${md}" || (echo "deploy.sh: docs_links: ERROR with the project directory structure!" && exit 1) ver_md="$(grep -c "${ver_git}" "${md}")" ret=0 - if [ "${ver_md}" -ne 0 ]; then + if [ "${ver_md}" -eq 0 ]; then ret=1 echo "Please, update mention & links in ${md} inside Builds section for release builds with version ${ver_git}." fi; @@ -108,16 +109,38 @@ docs_links() build_langs() { mk="../source/Makefile" - cd Translations/ || exit 1 + cd Translations/ || (echo "deploy.sh: build_langs: ERROR with the project directory structure!" && exit 1) langs="$(echo "$(find ./*.json | sed -ne 's,^\./translation_,,; s,\.json$,,; /[A-Z]/p' ; sed -ne 's/^ALL_LANGUAGES=//p;' "${mk}")" | sed 's, ,\n,g; s,\r,,g' | sort | uniq -u)" - ret=0 if [ -n "${langs}" ]; then - ret=1 echo "It seems there is mismatch between supported languages and enabled builds." echo "Please, check files in Translations/ and ALL_LANGUAGES variable in source/Makefile for:" echo "${langs}" + return 1 fi; - return "${ret}" + cd .. + + echo -ne "\n" + grep -nH $'\11' Translations/translation*.json + ret="${?}" + if [ "${ret}" -eq 0 ]; then + echo -ne "\t^^^^\t^^^^\n" + echo "Please, remove any tabs as indention from json file(s) in Translations/ directory (see the exact files & lines in the list above)." + echo "Use spaces only to indent in the future, please." + echo -ne "\n" + return 1 + fi; + + grep -nEH -e "^( {1}| {3}| {5}| {7}| {9}| {11})[^ ]" Translations/translation*.json + ret="${?}" + if [ "${ret}" -eq 0 ]; then + echo -ne "\t^^^^\t^^^^\n" + echo "Please, remove any odd amount of extra spaces as indention from json file(s) in Translations/ directory (see the exact files & lines in the list above)." + echo "Use even amount of spaces to indent in the future, please (two actual spaces per one indent, not tab)." + echo -ne "\n" + return 1 + fi; + + return 0 } # Helper function to check code style using clang-format & grep/sed custom parsers: