Fix issues reported by shellcheck

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2023-10-25 15:19:39 -03:00
parent 5d6d2f512b
commit cd883c6d76
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
10 changed files with 152 additions and 173 deletions

View File

@ -37,34 +37,28 @@ validateExtension() {
case $pathWithoutFirst in
doc/*)
if [ \
"${extension}" != "png" -a "${extension}" != "txt" \
-a "${extension}" != "html" -a "${extension}" != "js" \
-a "${extension}" != "css" -a "${extension}" != "gif" \
]; then
if [ "${extension}" != "png" ] && [ "${extension}" != "txt" ] &&
[ "${extension}" != "html" ] && [ "${extension}" != "js" ] &&
[ "${extension}" != "css" ] && [ "${extension}" != "gif" ]; then
foundFileExt
fi
;;
resources/js/global.d.ts)
;;
public/js/vendor/*)
if [ \
"${extension}" != "js" -a "${extension}" != "map" \
-a "${extension}" != "css" -a "${filename}" != "LICENSE" \
-a "${extension}" != "txt" \
]; then
if [ "${extension}" != "js" ] && [ "${extension}" != "map" ] &&
[ "${extension}" != "css" ] && [ "${filename}" != "LICENSE" ] &&
[ "${extension}" != "txt" ]; then
foundFileExt
fi
;;
public/js/dist/*)
if [ "${extension}" != "js" -a "${extension}" != "map" ];then
if [ "${extension}" != "js" ] && [ "${extension}" != "map" ]; then
foundFileExt
fi
;;
resources/js/src/*)
if [ \
"${extension}" != "ts" -a "${extension}" != "mjs" \
]; then
if [ "${extension}" != "ts" ] && [ "${extension}" != "mjs" ]; then
foundFileExt
fi
;;
@ -84,11 +78,9 @@ validateExtension() {
fi
;;
public/setup/*)
if [ \
"${extension}" != "php" -a "${extension}" != "twig" \
-a "${extension}" != "css" \
-a "${extension}" != "scss" -a "${extension}" != "gif" -a "${extension}" != "map" \
]; then
if [ "${extension}" != "php" ] && [ "${extension}" != "twig" ] &&
[ "${extension}" != "css" ] && [ "${extension}" != "scss" ] &&
[ "${extension}" != "gif" ] && [ "${extension}" != "map" ]; then
foundFileExt
fi
;;
@ -103,21 +95,17 @@ validateExtension() {
fi
;;
src/*)
if [ \
"${extension}" != "php" -a "${extension}" != "md" \
-a "${filename}" != "README" \
-a "${filename}" != "TEMPLATE" -a "${filename}" != "TEMPLATE_ABSTRACT" \
]; then
if [ "${extension}" != "php" ] && [ "${extension}" != "md" ] &&
[ "${filename}" != "README" ] && [ "${filename}" != "TEMPLATE" ] &&
[ "${filename}" != "TEMPLATE_ABSTRACT" ]; then
foundFileExt
fi
;;
public/themes/*)
if [ \
"${extension}" != "css" -a "${extension}" != "png" \
-a "${extension}" != "scss" -a "${extension}" != "map" \
-a "${extension}" != "svg" -a "${extension}" != "ico" \
-a "${extension}" != "gif" -a "${extension}" != "json" \
]; then
if [ "${extension}" != "css" ] && [ "${extension}" != "png" ] &&
[ "${extension}" != "scss" ] && [ "${extension}" != "map" ] &&
[ "${extension}" != "svg" ] && [ "${extension}" != "ico" ] &&
[ "${extension}" != "gif" ] && [ "${extension}" != "json" ]; then
foundFileExt
fi
;;
@ -135,25 +123,21 @@ validateExtension() {
vendor/composer/installed.json)
;;
vendor/tecnickcom/tcpdf/*)
if [ \
"${extension}" != "php" -a "${filename}" != "LICENSE.TXT" \
-a "${filename}" != "README.md" -a "${filename}" != "CHANGELOG.TXT" \
-a "${filename}" != "VERSION" -a "${filename}" != "composer.json" \
-a "${extension}" != "z" \
]; then
if [ "${extension}" != "php" ] && [ "${filename}" != "LICENSE.TXT" ] &&
[ "${filename}" != "README.md" ] && [ "${filename}" != "CHANGELOG.TXT" ] &&
[ "${filename}" != "VERSION" ] && [ "${filename}" != "composer.json" ] &&
[ "${extension}" != "z" ]; then
foundFileExt
fi
;;
vendor/*)
if [ \
"${extension}" != "php" -a "${filename}" != "LICENSE" \
-a "${filename}" != "README" -a "${filename}" != "CHANGELOG" \
-a "${filename}" != "composer.json" -a "${filename}" != "CHANGELOG.md" \
-a "${filename}" != "README.md" -a "${filename}" != "BACKERS.md" \
-a "${filename}" != "LICENSE.md" -a "${filename}" != "ARCHITECTURE.md" \
-a "${filename}" != "LICENSE.txt" -a "${filename}" != "AUTHORS" \
-a "${filename}" != "LICENCE.md" -a "${filename}" != "LICENCE" \
]; then
if [ "${extension}" != "php" ] && [ "${filename}" != "LICENSE" ] &&
[ "${filename}" != "README" ] && [ "${filename}" != "CHANGELOG" ] &&
[ "${filename}" != "composer.json" ] && [ "${filename}" != "CHANGELOG.md" ] &&
[ "${filename}" != "README.md" ] && [ "${filename}" != "BACKERS.md" ] &&
[ "${filename}" != "LICENSE.md" ] && [ "${filename}" != "ARCHITECTURE.md" ] &&
[ "${filename}" != "LICENSE.txt" ] && [ "${filename}" != "AUTHORS" ] &&
[ "${filename}" != "LICENCE.md" ] && [ "${filename}" != "LICENCE" ]; then
foundFileExt
fi
;;
@ -239,10 +223,6 @@ for filePath in ${FILE_LIST}; do
foundFile;;
*/.php_cs.cache)
foundFile;;
*/psalm.xml)
foundFile;;
*/phpstan.neon)
foundFile;;
*/phpstan.neon)
foundFile;;
*/phpcs.xml.dist)
@ -267,8 +247,6 @@ for filePath in ${FILE_LIST}; do
foundFile;;
*/makefile)
foundFile;;
*/Makefile)
foundFile;;
*/.phpunit.result.cache)
foundFile;;
*/phpstan.neon.dist)

View File

@ -76,13 +76,13 @@ while [ $# -gt 0 ] ; do
*)
do_test=1
if [ -z "$version" ] ; then
version=`echo $1 | tr -d -c '0-9a-z.+-'`
version=$(echo "$1" | tr -d -c '0-9a-z.+-')
if [ "x$version" != "x$1" ] ; then
echo "Invalid version: $1"
exit 1
fi
elif [ -z "$branch" ] ; then
branch=`echo $1 | tr -d -c '/0-9A-Za-z_-'`
branch=$(echo "$1" | tr -d -c '/0-9A-Za-z_-')
if [ "x$branch" != "x$1" ] ; then
echo "Invalid branch: $1"
exit 1
@ -100,7 +100,7 @@ if [ -z "$branch" ]; then
exit 1
fi
if [ -z "$version" -a $do_ci -eq 0 ]; then
if [ -z "$version" ] && [ $do_ci -eq 0 ]; then
echo "Version must be specified!"
exit 1
fi
@ -110,7 +110,7 @@ kit_prefix="phpMyAdmin-$version"
# Checks whether remote branch has local tracking branch
ensure_local_branch() {
if ! git branch | grep -q '^..'"$1"'$' ; then
git branch --track $1 origin/$1
git branch --track "$1" origin/"$1"
fi
}
@ -120,9 +120,9 @@ mark_as_release() {
branch=$1
rel_branch=$2
echo "* Marking release as $rel_branch"
ensure_local_branch $rel_branch
git checkout $rel_branch
git merge -s recursive -X theirs $branch
ensure_local_branch "$rel_branch"
git checkout "$rel_branch"
git merge -s recursive -X theirs "$branch"
git checkout master
}
@ -257,7 +257,7 @@ backup_vendor_folder() {
}
restore_vendor_folder() {
if [ ! -d ${TEMP_FOLDER} ]; then
if [ ! -d "${TEMP_FOLDER}" ]; then
echo 'No backup to restore'
exit 1;
fi
@ -279,7 +279,7 @@ create_phpunit_sandbox() {
}
delete_phpunit_sandbox() {
if [ ! -d ${TEMP_PHPUNIT_FOLDER} ]; then
if [ ! -d "${TEMP_PHPUNIT_FOLDER}" ]; then
echo 'No phpunit sandbox to delete'
exit 1;
fi
@ -342,7 +342,7 @@ CODE
}
# Ensure we have tracking branch
ensure_local_branch $branch
ensure_local_branch "$branch"
VERSION_FILE=src/Version.php
@ -374,7 +374,7 @@ fi
echo "The actual configured release is: $VERSION_FROM_FILE"
echo "The actual configured release series is: $VERSION_SERIES_FROM_FILE"
if [ $do_ci -eq 0 -a $do_daily -eq 0 ] ; then
if [ $do_ci -eq 0 ] && [ $do_daily -eq 0 ] ; then
cat <<END
Please ensure you have incremented rc count or version in the repository :
@ -390,7 +390,7 @@ Please ensure you have incremented rc count or version in the repository :
Continue (y/n)?
END
read do_release
read -r do_release
if [ "$do_release" != 'y' ]; then
exit 100
@ -403,21 +403,21 @@ mkdir -p release
git worktree prune
workdir_name=phpMyAdmin-$version
workdir=release/$workdir_name
if [ -d $workdir ] ; then
if [ -d "$workdir" ] ; then
echo "Working directory '$workdir' already exists, please move it out of the way"
exit 1
fi
# Add worktree with chosen branch
git worktree add --force $workdir $branch
cd $workdir
git worktree add --force "$workdir" "$branch"
cd "$workdir"
if [ $do_pull -eq 1 ] ; then
git pull -q
fi
if [ $do_daily -eq 1 ] ; then
git_head=`git log -n 1 --format=%H`
git_head_short=`git log -n 1 --format=%h`
today_date=`date +'%Y%m%d' -u`
git_head=$(git log -n 1 --format=%H)
git_head_short=$(git log -n 1 --format=%h)
today_date=$(date +'%Y%m%d' -u)
fi
if [ $do_daily -eq 1 ] ; then
@ -432,7 +432,7 @@ if [ $do_daily -eq 1 ] ; then
fi
# Check release version
if [ $do_ci -eq 0 -a -$do_daily -eq 0 ] ; then
if [ $do_ci -eq 0 ] && [ -$do_daily -eq 0 ] ; then
if ! grep -q "VERSION = '$version'" $VERSION_FILE ; then
echo "There seems to be wrong version in $VERSION_FILE!"
exit 2
@ -453,9 +453,9 @@ fi
# Save the build date
if [ $do_daily -eq 1 ] ; then
LC_ALL=C date -u > RELEASE-DATE-$VERSION_SERIES_FROM_FILE+snapshot
LC_ALL=C date -u > RELEASE-DATE-"$VERSION_SERIES_FROM_FILE"+snapshot
else
LC_ALL=C date -u > RELEASE-DATE-$version
LC_ALL=C date -u > RELEASE-DATE-"$version"
fi
# Building documentation
@ -523,6 +523,8 @@ done
echo "* Installing composer packages '$PACKAGES_VERSIONS'"
# Allows word splitting
# shellcheck disable=SC2086
composer require --no-interaction $PACKAGES_VERSIONS
echo "* Running a security checkup"
@ -565,7 +567,7 @@ if [ $do_test -eq 1 ] ; then
test_ret=$?
if [ $do_ci -eq 1 ] ; then
cd ../..
rm -r $workdir
rm -r "$workdir"
git worktree prune
if [ "$branch" = "ci" ] ; then
git branch -D ci
@ -594,14 +596,14 @@ for kit in $KITS ; do
echo "* Building kit: $kit"
# Copy all files
name=$kit_prefix-$kit
cp -r $workdir_name $name
cp -r "$workdir_name" "$name"
# Cleanup translations
cd $name
./scripts/lang-cleanup.sh $kit
cd "$name"
./scripts/lang-cleanup.sh "$kit"
# Remove tests, source code,...
if [ $kit != source ] ; then
if [ "$kit" != source ] ; then
echo "* Removing source files"
# Testsuite
rm -r test/
@ -632,28 +634,28 @@ for kit in $KITS ; do
cd ..
# Remove tar file possibly left from previous run
rm -f $name.tar
rm -f "$name".tar
# Prepare distributions
for comp in $COMPRESSIONS ; do
case $comp in
tbz|tgz|txz)
if [ ! -f $name.tar ] ; then
if [ ! -f "$name".tar ] ; then
echo "* Creating $name.tar"
tar --owner=root --group=root --numeric-owner --sort=name -cf $name.tar $name
tar --owner=root --group=root --numeric-owner --sort=name -cf "$name".tar "$name"
fi
if [ $comp = txz ] ; then
if [ "$comp" = txz ] ; then
echo "* Creating $name.tar.xz"
xz -9k $name.tar
xz -9k "$name".tar
fi
if [ $comp = tgz ] ; then
if [ "$comp" = tgz ] ; then
echo "* Creating $name.tar.gz"
gzip -9c $name.tar > $name.tar.gz
gzip -9c "$name".tar > "$name".tar.gz
fi
;;
zip-7z)
echo "* Creating $name.zip"
7za a -bd -tzip $name.zip $name > /dev/null
7za a -bd -tzip "$name".zip "$name" > /dev/null
;;
*)
echo "WARNING: ignoring compression '$comp', not known!"
@ -663,29 +665,29 @@ for kit in $KITS ; do
# Cleanup
rm -f $name.tar
rm -f "$name".tar
# Remove directory with current dist set
rm -r $name
rm -r "$name"
done
# Cleanup
rm -r $workdir_name
rm -r "$workdir_name"
git worktree prune
# Signing of files with default GPG key
echo "* Signing files"
for file in $kit_prefix-*.gz $kit_prefix-*.zip $kit_prefix-*.xz ; do
for file in "$kit_prefix"-*.gz "$kit_prefix"-*.zip "$kit_prefix"-*.xz ; do
if [ $do_sign -eq 1 ] ; then
gpg --detach-sign --armor $file
gpg --detach-sign --armor "$file"
fi
sha1sum $file > $file.sha1
sha256sum $file > $file.sha256
sha1sum "$file" > "$file".sha1
sha256sum "$file" > "$file".sha256
done
if [ $do_daily -eq 1 ] ; then
cat > $kit_prefix.json << EOT
cat > "$kit_prefix".json << EOT
{
"date": "`date --iso-8601=seconds`",
"date": "$(date --iso-8601=seconds)",
"commit": "$git_head"
}
EOT
@ -699,7 +701,7 @@ echo ""
echo "Files:"
echo "------"
ls -la *.gz *.zip *.xz
ls -la -- *.gz *.zip *.xz
cd ..
@ -707,15 +709,15 @@ cd ..
if [ $do_tag -eq 1 ] ; then
echo
echo "Additional tasks:"
tagname=RELEASE_`echo $version | tr . _ | tr '[:lower:]' '[:upper:]' | tr -d -`
tagname=RELEASE_$(echo "$version" | tr . _ | tr '[:lower:]' '[:upper:]' | tr -d -)
echo "* Tagging release as $tagname"
git tag -s -a -m "Released $version" $tagname $branch
git tag -s -a -m "Released $version" "$tagname" "$branch"
echo " Dont forget to push tags using: git push --tags"
fi
# Mark as stable release
if [ $do_stable -eq 1 ] ; then
mark_as_release $branch STABLE
mark_as_release "$branch" STABLE
fi
cat <<END

View File

@ -5,7 +5,7 @@ if [ -n "$GATEWAY_INTERFACE" ] ; then
exit 1
fi
if [ x$1 = x--quiet ] ; then
if [ "$1" = --quiet ] ; then
stats=""
shift
else
@ -13,26 +13,26 @@ else
fi
compile() {
lang=`echo $1 | sed 's@po/\(.*\)\.po@\1@'`
if [ ! -z "$stats" ] ; then
echo -n "$lang: "
lang=$(echo "$1" | sed 's@po/\(.*\)\.po@\1@')
if [ -n "$stats" ] ; then
printf "%s: " "$lang"
fi
mkdir -p locale/$lang/LC_MESSAGES
msgfmt $stats --check -o locale/$lang/LC_MESSAGES/phpmyadmin.mo $1
mkdir -p locale/"$lang"/LC_MESSAGES
msgfmt $stats --check -o locale/"$lang"/LC_MESSAGES/phpmyadmin.mo "$1"
return $?
}
if [ ! -z "$1" ] ; then
compile po/$1.po
if [ -n "$1" ] ; then
compile po/"$1".po
exit $?
fi
result=0
for x in po/*.po ; do
compile $x
compile "$x"
ret=$?
if [ $ret != 0 ] ; then
echo Error when compiling $x >&2
echo Error when compiling "$x" >&2
result=$ret
fi
done

View File

@ -42,6 +42,7 @@ for type in "$@" ; do
done
# Delete unwanted languages
# shellcheck disable=SC2086
find po locale vendor/phpmyadmin/sql-parser/locale -type f $match -print0 | xargs -0r rm
# Delete empty directories

View File

@ -6,6 +6,6 @@ if [ -n "$GATEWAY_INTERFACE" ] ; then
fi
for x in po/*.po ; do
grep 'Team' $x | sed 's/.*: \(.*\)<.*/\1/'
git shortlog -sne --no-merges -- $x | grep '^ [ 0-9][0-9]\{3\}'
grep 'Team' "$x" | sed 's/.*: \(.*\)<.*/\1/'
git shortlog -sne --no-merges -- "$x" | grep '^ [ 0-9][0-9]\{3\}'
done

View File

@ -22,52 +22,54 @@ THRESHOLD=40
TMPOUTPUTFILE=app/language_stats.inc.php.tmp
OUTPUTFILE=app/language_stats.inc.php
if [ ! -z "$1" ] ; then
if [ -n "$1" ] ; then
THRESHOLD=$1
fi
echo '<?php' > $TMPOUTPUTFILE
echo '/**' >> $TMPOUTPUTFILE
echo ' * Automatically generated file, do not edit!' >> $TMPOUTPUTFILE
echo ' * Generated by scripts/remove-incomplete-mo' >> $TMPOUTPUTFILE
echo ' */' >> $TMPOUTPUTFILE
echo '' >> $TMPOUTPUTFILE
echo "\$GLOBALS['language_stats'] = [" >> $TMPOUTPUTFILE
{
echo '<?php'
echo '/**'
echo ' * Automatically generated file, do not edit!'
echo ' * Generated by scripts/remove-incomplete-mo'
echo ' */'
echo ''
echo "\$GLOBALS['language_stats'] = ["
} > $TMPOUTPUTFILE
check() {
TMPOUTPUTFILE=$2
lang=`echo $1 | sed 's@po/\(.*\)\.po@\1@'`
STATS=`LC_ALL=C msgfmt --statistics -o /dev/null $1 2>&1`
if echo $STATS | grep -q ' translated ' ; then
TRANSLATED=`echo $STATS | sed 's/\(^\|.* \)\([0-9]*\) translated.*/\2/'`
lang=$(echo "$1" | sed 's@po/\(.*\)\.po@\1@')
STATS=$(LC_ALL=C msgfmt --statistics -o /dev/null "$1" 2>&1)
if echo "$STATS" | grep -q ' translated ' ; then
TRANSLATED=$(echo "$STATS" | sed 's/\(^\|.* \)\([0-9]*\) translated.*/\2/')
else
TRANSLATED=0
fi
if echo $STATS | grep -q ' fuzzy ' ; then
FUZZY=`echo $STATS | sed 's/\(^\|.* \)\([0-9]*\) fuzzy.*/\2/'`
if echo "$STATS" | grep -q ' fuzzy ' ; then
FUZZY=$(echo "$STATS" | sed 's/\(^\|.* \)\([0-9]*\) fuzzy.*/\2/')
else
FUZZY=0
fi
if echo $STATS | grep -q ' untranslated ' ; then
UNTRANSLATED=`echo $STATS | sed 's/\(^\|.* \)\([0-9]*\) untranslated.*/\2/'`
if echo "$STATS" | grep -q ' untranslated ' ; then
UNTRANSLATED=$(echo "$STATS" | sed 's/\(^\|.* \)\([0-9]*\) untranslated.*/\2/')
else
UNTRANSLATED=0
fi
PERCENT=`expr 100 \* $TRANSLATED / \( $TRANSLATED + $FUZZY + $UNTRANSLATED \) || true`
echo " '$lang' => $PERCENT," >> $TMPOUTPUTFILE
PERCENT=$((100 * TRANSLATED / ( TRANSLATED + FUZZY + UNTRANSLATED )))
echo " '$lang' => $PERCENT," >> "$TMPOUTPUTFILE"
if [ $PERCENT -lt $THRESHOLD ] ; then
if [ "$PERCENT" -lt "$THRESHOLD" ] ; then
echo "Removing $lang, only $PERCENT%"
rm -f locale/$lang/LC_MESSAGES/phpmyadmin.mo
rmdir locale/$lang/LC_MESSAGES
rmdir locale/$lang
rm -f locale/"$lang"/LC_MESSAGES/phpmyadmin.mo
rmdir locale/"$lang"/LC_MESSAGES
rmdir locale/"$lang"
fi
}
for x in po/*.po ; do
check $x $TMPOUTPUTFILE
check "$x" "$TMPOUTPUTFILE"
done
echo '];' >> $TMPOUTPUTFILE
echo '];' >> "$TMPOUTPUTFILE"
mv $TMPOUTPUTFILE $OUTPUTFILE
mv "$TMPOUTPUTFILE" $OUTPUTFILE

View File

@ -49,7 +49,7 @@ fi
# for instance), and while that's more precise this should work with less to fix if a line changes.
# This method wasn't selected for any particular strength.
oldVersion="$(grep 'version =' ${dir}doc/conf.py | cut -d "'" -f2)"
oldVersion="$(grep 'version =' "${dir}"doc/conf.py | cut -d "'" -f2)"
echo "Changing from ${oldVersion} to ${newVersion}..."

View File

@ -17,8 +17,7 @@ if [ -n "$GATEWAY_INTERFACE" ] ; then
exit 1
fi
echo $#
if [ $# -ne 3 -a $# -ne 4 ]; then
if [ $# -ne 3 ] && [ $# -ne 4 ]; then
echo -e "Usage: ./generator_plugin.sh MIMEType MIMESubtype TransformationName [Description]\n"
exit 65
fi
@ -27,35 +26,31 @@ fi
# are in the correct format
# make all names lowercase
MT="`echo $1 | tr [:upper:] [:lower:]`"
MS="`echo $2 | tr [:upper:] [:lower:]`"
TN="`echo $3 | tr [:upper:] [:lower:]`"
MT="$(echo "$1" | tr '[:upper:]' '[:lower:]')"
MS="$(echo "$2" | tr '[:upper:]' '[:lower:]')"
TN="$(echo "$3" | tr '[:upper:]' '[:lower:]')"
# make first letter uppercase
MT="${MT^}"
MS="${MS^}"
TN="${TN^}"
# make the first letter after each underscore uppercase
MT="`echo $MT`"
MT="`echo $MT | sed -e 's/_./\U&\E/g'`"
MS="`echo $MS`"
MS="`echo $MS | sed -e 's/_./\U&\E/g'`"
TN="`echo $TN`"
TN="`echo $TN | sed -e 's/_./\U&\E/g'`"
# make the first letter after each underscore uppercase
# define the name of the main class file and of its template
ClassFile=$MT\_$MS\_$TN.php
Template=TEMPLATE
CLASS_NAME=$(echo "$MT"_"$MS"_"$TN" | sed -e 's/_./\U&\E/g')
BASE_DIR="./src/Plugins/Transformations"
ClassFile="$BASE_DIR"/"$CLASS_NAME".php
Template="$BASE_DIR"/TEMPLATE
# define the name of the abstract class file and its template
AbstractClassFile=abs/"$TN"TransformationsPlugin.php
AbstractTemplate=TEMPLATE_ABSTRACT
AbstractClassFile="$BASE_DIR"/Abs/"$TN"TransformationsPlugin.php
AbstractTemplate="$BASE_DIR"/TEMPLATE_ABSTRACT
# replace template names with argument names
sed "s/\[MIMEType]/$MT/; s/\[MIMESubtype\]/$MS/; s/\[TransformationName\]/$TN/;" < $Template > $ClassFile
sed "s/\[MIMEType]/$MT/; s/\[MIMESubtype\]/$MS/; s/\[TransformationName\]/$TN/;" < $Template > "$ClassFile"
echo "Created $ClassFile"
GenerateAbstractClass=1
if [ -n $4 ]; then
if [ -n "$4" ]; then
if [ "$4" == "--generate_only_main_class" ]; then
if [ -e $AbstractClassFile ]; then
if [ -e "$AbstractClassFile" ]; then
GenerateAbstractClass=0
fi
fi
@ -63,8 +58,6 @@ fi
if [ $GenerateAbstractClass -eq 1 ]; then
# replace template names with argument names
sed "s/\[TransformationName\]/$TN/; s/Description of the transformation./$4/;" < $AbstractTemplate > $AbstractClassFile
sed "s/\[TransformationName\]/$TN/; s/Description of the transformation./$4/;" < $AbstractTemplate > "$AbstractClassFile"
echo "Created $AbstractClassFile"
fi
echo ""

View File

@ -16,14 +16,17 @@ rm -rf twig-templates/
php scripts/console cache:warmup --twig-po --env development
# Update pot (template), ensure that advisor is at the end
LOCS=`ls po/*.po | sed 's@.*/\(.*\)\.po@\1@'`
LOCS=$(find po -name '*.po' | sed 's@.*/\(.*\)\.po@\1@')
find . -name '*.php' -not -path './test/*' -not -path './po/*' -not -path './tmp/*' -not -path './release/*' -not -path './node_modules/*' -not -path './vendor/*' > twig-templates/filesList
php ./scripts/match-twig-cache
cat ./twig-templates/filesList | sort --dictionary-order --ignore-case --output ./twig-templates/filesList
sort --dictionary-order --ignore-case --output ./twig-templates/filesListTemp < ./twig-templates/filesList
mv ./twig-templates/filesListTemp ./twig-templates/filesList
php ./scripts/match-twig-cache --reverse
# Allows word splitting for files list.
# shellcheck disable=SC2046
xgettext \
-d phpmyadmin \
--msgid-bugs-address=translators@phpmyadmin.net \
@ -35,7 +38,7 @@ xgettext \
--from-code=utf-8 \
--keyword=__ --keyword=_gettext --keyword=_pgettext:1c,2 --keyword=_ngettext:1,2 \
--copyright-holder="phpMyAdmin devel team" \
`cat ./twig-templates/filesList`
$(cat ./twig-templates/filesList)
# Fixup filenames for Twig templates
php scripts/console fix-po-twig
@ -53,8 +56,8 @@ ver="$(fetchReleaseFromFile)"
sed -i.~ '
s/SOME DESCRIPTIVE TITLE/phpMyAdmin translation/;
s/PACKAGE/phpMyAdmin/;
s/(C) YEAR/(C) 2003 - '`date +%Y`'/;
s/VERSION/'$ver'/;
s/(C) YEAR/(C) 2003 - '"$(date +%Y)"'/;
s/VERSION/'"$ver"'/;
' po/phpmyadmin.pot
# Update po files (translations)
@ -62,11 +65,11 @@ for loc in $LOCS ; do
sed -i.~ '
s/SOME DESCRIPTIVE TITLE/phpMyAdmin translation/;
s/PACKAGE/phpMyAdmin/;
s/(C) YEAR/(C) 2003 - '`date +%Y`'/;
s/VERSION/'$ver'/;
s/Project-Id-Version: phpMyAdmin .*/Project-Id-Version: phpMyAdmin '$ver'\\n"/;
' po/$loc.po
msgmerge --previous -U po/$loc.po po/phpmyadmin.pot
s/(C) YEAR/(C) 2003 - '"$(date +%Y)"'/;
s/VERSION/'"$ver"'/;
s/Project-Id-Version: phpMyAdmin .*/Project-Id-Version: phpMyAdmin '"$ver"'\\n"/;
' po/"$loc".po
msgmerge --previous -U po/"$loc".po po/phpmyadmin.pot
done
# Commit changes

View File

@ -14,7 +14,7 @@ if [ $# -lt 2 ] ; then
echo 'Must be called in directory with binaries or with path'
exit 1
fi
REL=`echo $1 | tr -d -c '0-9a-z.-'`
REL=$(echo "$1" | tr -d -c '0-9a-z.-')
if [ "x$REL" != "x$1" ] ; then
echo "Invalid version: $1"
exit 1
@ -24,8 +24,8 @@ if [ $# -gt 1 ] ; then
cd "$2"
fi
BATCH=`mktemp`
cat > $BATCH <<EOT
BATCH=$(mktemp)
cat > "$BATCH" <<EOT
cd /mnt/storage/files/phpMyAdmin
mkdir $REL
cd $REL
@ -61,9 +61,9 @@ put phpMyAdmin-$REL-source.tar.xz.sha1
EOT
# Upload to our file server
sftp -P 11022 -f -b $BATCH files@hertz.phpmyadmin.net
sftp -P 11022 -f -b "$BATCH" files@hertz.phpmyadmin.net
rm $BATCH
rm "$BATCH"
# Sync files to CDN
ssh -xka2 -p 11022 files@hertz.phpmyadmin.net ./bin/sync-files-cdn