Script Overhaul

images/degimpify.sh → images/scripts/degimpify.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Run this script on a directory to "degimpify" all XPM files
 # within that directory (meaning any file ending with .XPM)
@@ -12,9 +12,9 @@ shopt -s nullglob
 input_dirs="$*"
 
 if [ $# -eq 0 ]; then
-    input_dirs[0]="./EditButtons"
-    input_dirs[1]="./TranscriptionImages"
-    input_dirs[2]="./ControlButtons"
+    input_dirs[0]="${BASH_SOURCE[0]}/../../images/EditButtons"
+    input_dirs[1]="${BASH_SOURCE[0]}/../../images/TranscriptionImages"
+    input_dirs[2]="${BASH_SOURCE[0]}/../../images/ControlButtons"
 fi
 
 for dir in "${input_dirs[@]}"

linux/AppRun.sh

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
+#!/bin/sh
 # The AppImage runtime sets some special environment variables. We provide
 # default values here in case the user tries to run this script outside an
 # AppImage where the variables would otherwise be undefined.
-if [[ ! "${APPIMAGE}" || ! "${APPDIR}" ]]; then
+if [ ! "${APPIMAGE}" ] || [ ! "${APPDIR}" ]; then
     export APPIMAGE="$(readlink -f "${0}")"
     export APPDIR="$(dirname "${APPIMAGE}")"
 fi
@@ -12,8 +12,7 @@ export LD_LIBRARY_PATH="${APPDIR}/lib:${LD_LIBRARY_PATH}"
 export AUDACITY_PATH="${AUDACITY_PATH}:${APPDIR}/share/tenacity"
 export AUDACITY_MODULES_PATH="${AUDACITY_MODULES_PATH}:${APPDIR}/lib/modules"
 
-function help()
-{
+help() {
     # Normal tenacity help
     "${APPDIR}/bin/tenacity" --help
     # Special options handled by this script

linux/build-environment/dependencies.sh

@@ -1,24 +1,26 @@
+#!/bin/sh
+
 export TZ=Europe/London
 ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-apt_packages_basic=(
+apt_packages_basic="
     build-essential
     python3-minimal
     python3-pip
     g++-9
     libstdc++-9-dev
     cmake
     git
-)
+"
 
-apt_packages_minimal_deps=(
+apt_packages_minimal_deps="
     libgtk2.0-dev
     libasound2-dev
     libavformat-dev
     libjack-jackd2-dev
-)
+"
 
-apt_packages_full_deps=(
+apt_packages_full_deps="
     zlib1g-dev
     libexpat1-dev
     libmp3lame-dev
@@ -51,12 +53,12 @@ apt_packages_full_deps=(
     libcurl4-openssl-dev
     libpng-dev
     libjpeg-turbo8-dev
-)
+"
 
 apt-get install -y --no-install-recommends \
-  "${apt_packages_basic[@]}" \
-  "${apt_packages_minimal_deps[@]}" \
-  "${apt_packages_full_deps[@]}"
+  "$apt_packages_basic" \
+  "$apt_packages_minimal_deps" \
+  "$apt_packages_full_deps"
 
 
 pip3 install conan

linux/build-environment/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 conan --version
 

linux/check_dependencies.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 version="@CPACK_PACKAGE_NAME@ v@CPACK_PACKAGE_VERSION@ @CPACK_AUDACITY_ARCH_LABEL@"
 

locale/CMakeLists.txt

@@ -16,9 +16,9 @@ if( GETTEXT_FOUND )
    mark_as_advanced( FORCE GETTEXT_MSGMERGE_EXECUTABLE )
    set( msgfmt "${GETTEXT_MSGFMT_EXECUTABLE}" )
 elseif( PYTHON )
-   set( msgfmt "${PYTHON}" "${TARGET_ROOT}/msgfmt.py" )
+   set( msgfmt "${PYTHON}" "${TARGET_ROOT}/scripts/msgfmt.py" )
 elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" )
-   nuget_package( pkgdir "Gettext.Tools" "0.20.1.1" )
+   nuget_package( pkgdir "Gettext.Tools" "0.21.0.1" )
    file( TO_NATIVE_PATH "${pkgdir}/tools/bin/msgfmt.exe" msgfmt )
 endif()
 
@@ -80,9 +80,8 @@ endforeach()
 add_custom_target( "${TARGET}" ALL DEPENDS ${OUTPUTS} SOURCES "${SOURCES}" )
 
 if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
-   if( NOT WIN32)
-      install( DIRECTORY ${locale}/
-               TYPE LOCALE )
+   if( NOT WIN32 )
+      install( DIRECTORY ${locale} TYPE LOCALE )
    endif()
 endif()
 

locale/diagnostics.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Report how complete each translation catalog is
 
@@ -8,9 +8,11 @@ total=`grep '^msgid' audacity.pot | wc -l`
 #CSV header
 echo "Name,Completed,Pct. completed,Bad lines"
 
-declare -i badlines
+badlines=0
+
+for filename in *.po; do
+	[ -e "$filename" ] || break
 
-for filename in `ls *.po`; do
     # If there are errors from msgcmp, then the last line on standard error
     # contains a count of problematic messages; else it won't match the
     # pattern in awk, so assume no errors
@@ -20,7 +22,7 @@ for filename in `ls *.po`; do
 
     # detect whether this sequence occurs in any .po file.  It will break
     # msgfmt on Windows.
-    badlines=`fgrep '#~|' ${filename} | wc -l`
+	badlines=`grep -Fc '#~|' "${filename}"`
 
     # produce comma-separated values
     echo "$filename,$complete,$((complete*100/total)),$badlines"

locale/no_id.sh

@@ -1,3 +1,5 @@
+#!/bin/sh
+
 for i in *.po; do
     sed -i '/^Project/d' $i
-done
+done

locale/LanguageNames.txt → locale/scripts/LanguageNames.txt

@@ -5,7 +5,7 @@ bg Български
 bn বাংলা
 bs Bosanski
 ca Català
-ca_ES@valencia Valencià
+ca@valencia Valencià
 co Corsu
 cs Čeština
 cy Cymraeg
@@ -15,7 +15,6 @@ el Ελληνικά
 en English
 es Español
 eu Euskara
-eu_ES Euskara (Espainiako)
 fa فارسی
 fi Suomi
 fr Français
@@ -40,19 +39,19 @@ nb Norsk
 nl Nederlands
 oc Occitan
 pl Polski
-pt Português
+pt_PT Português
 pt_BR Português (Brasil)
 ro Română
 ru Русский
 sk Slovenčina
 sl Slovenščina
-sr_RS Српски
-sr_RS@latin Srpski
+sr Српски
+sr_Latn Srpski
 sv Svenska
 ta தமிழ்
 tg Тоҷикӣ
 tr Türkçe
 uk Українська
 vi Tiếng Việt
-zh_CN 中文（简体）
-zh_TW 中文（繁體）
+zh 中文（简体）
+zh_Hant 中文（繁體）

locale/scripts/find-PO-no-Id.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Run this script on a directory to handle PO files with no id
+DIRNAME=$(dirname "$0")
+
+if [ $# -eq 0 ]; then
+    set -- "$DIRNAME/../"
+fi
+
+for dir in "$@"
+do
+    for po_file in "${dir}"/*.po; do
+       sed -i '/^Project/d' "$po_file"
+    done
+done

locale/find-duplicates.pl → locale/scripts/find-POT-duplicates.pl

@@ -2,8 +2,7 @@
 
 use strict 'vars';
 
-open(my $fh, "<", "audacity.pot")
-    or die "Can't open < audacity.pot: $!";
+open(my $fh, "<", "../tenacity.pot") or die "Can't open < ../tenacity.pot: $!";
 
 my @sourcelines = ();
 

locale/fix_po_files.py → locale/scripts/fix-PO-files.py

@@ -1,7 +1,7 @@
 import polib
 import os
 
-localedir = './'
+localedir = '../'
 count_seen = 0
 count_modified = 0
 

locale/scripts/locale_diagnostics.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Report how complete each translation catalog is
+
+# How many messages in total?
+total=$(grep -c '^msgid' "../tenacity.pot")
+
+
+declare -i badlines
+for po_file in ../*.po; do
+    # If there are errors from msgcmp, then the last line on standard error
+    # contains a count of problematic messages; else it won't match the
+    # pattern in awk, so assume no errors
+    errors=$(msgcmp "$po_file" "../tenacity.pot" 2>&1 | awk '/msgcmp: found [0-9]* fatal error/ { nn = $3 } END {print 0+nn}')
+    complete=$((total-errors))
+
+    # detect whether this sequence occurs in any .po file.  It will break msgfmt on Windows.
+    badlines=$(grep -F -c '#~|' "${po_file}")
+
+    echo "$po_file: completed $complete of $total ($((complete*100/total))%); Windows Incompatible Lines: $badlines"
+done | sort -n -t , -k3
+
+exit 0

locale/scripts/regen_POT_file.sh

@@ -0,0 +1,46 @@
+#!/bin/sh
+# Run this script with /locale/script/ as the current directory
+set -o errexit
+
+DIRNAME=$(dirname "$0")
+
+echo ";; Recreating tenacity.pot using .h, .cpp and .mm files"
+for path in "$DIRNAME/../modules/mod-*" "$DIRNAME/../libraries/lib-*" "$DIRNAME/../include" "$DIRNAME/../src" ; do
+   find "$path" -name \*.h -o -name \*.cpp -o -name \*.mm
+done | LANG=c sort | \
+sed -E 's/\.\.\///g' |\
+xargs xgettext \
+--no-wrap \
+--default-domain=tenacity \
+--directory="$DIRNAME/../.." \
+--keyword=_ --keyword=XO --keyword=XC:1,2c --keyword=XXO --keyword=XXC:1,2c --keyword=XP:1,2 --keyword=XPC:1,2,4c \
+--add-comments=" i18n" \
+--add-location=file  \
+--copyright-holder='Tenacity Contributors' \
+--package-name="tenacity" \
+--package-version='3.0.4' \
+--msgid-bugs-address="emabrey@tenacityaudio.org" \
+--add-location=file -L C -o "$DIRNAME/../tenacity.pot"
+
+echo ";; Adding nyquist files to tenacity.pot"
+for path in "$DIRNAME/../../plug-ins/"* ; do find "$path" -name \*.ny -not -name rms.ny; done | LANG=c sort | \
+sed -E 's/\.\.\///g' |\
+xargs xgettext \
+--no-wrap \
+--default-domain=tenacity \
+--directory="$DIRNAME/../.." \
+--keyword=_ --keyword=_C:1,2c --keyword=ngettext:1,2 --keyword=ngettextc:1,2,4c \
+--add-comments=" i18n" \
+--add-location=file  \
+--copyright-holder='Tenacity Contributors' \
+--package-name="tenacity" \
+--package-version='3.0.4' \
+--msgid-bugs-address="emabrey@tenacityaudio.org" \
+--add-location=file -L Lisp -j -o "$DIRNAME/../tenacity.pot"
+
+echo ""
+echo ";; POT file generated"
+echo ""
+
+head -n 11 "$DIRNAME/../tenacity.pot" | tail -n 3
+wc -l "$DIRNAME/../tenacity.pot"