From 414ab468e63ae3e6e4499554ad0bc2c1d7c6901f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rytis=20Arku=C5=A1auskas?= Date: Tue, 14 Feb 2023 14:45:26 +0000 Subject: [PATCH 01/11] Translated using Weblate (Lithuanian) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 38.1% (1309 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/lt/ Signed-off-by: Rytis Arkušauskas --- po/lt.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/po/lt.po b/po/lt.po index b5cab49126..fe36fc53a0 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2023-02-08 15:09+0000\n" -"PO-Revision-Date: 2022-02-17 10:35+0000\n" -"Last-Translator: Maurício Meneghini Fauth \n" -"Language-Team: Lithuanian \n" +"PO-Revision-Date: 2023-02-17 01:46+0000\n" +"Last-Translator: Rytis Arkušauskas \n" +"Language-Team: Lithuanian \n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -15,7 +15,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n % 10 == 1 && (n % 100 < 11 || n % 100 > " "19)) ? 0 : ((n % 10 >= 2 && n % 10 <= 9 && (n % 100 < 11 || n % 100 > 19)) ? " "1 : 2);\n" -"X-Generator: Weblate 4.11-dev\n" +"X-Generator: Weblate 4.16-dev\n" #: libraries/advisory_rules_generic.php:9 msgid "Uptime below one day" @@ -10617,7 +10617,7 @@ msgstr "Varikliai" #: libraries/classes/Menu.php:566 libraries/classes/Util.php:1971 #: templates/server/plugins/index.twig:4 msgid "Plugins" -msgstr "" +msgstr "Įskiepiai" #: libraries/classes/Message.php:252 #, fuzzy, php-format @@ -10728,7 +10728,7 @@ msgstr "Stulpeliai" #: libraries/classes/Navigation/Nodes/NodeColumnContainer.php:33 msgctxt "Create new column" msgid "New" -msgstr "" +msgstr "Naujas" #: libraries/classes/Navigation/Nodes/NodeColumn.php:32 #: libraries/classes/Plugins/Export/ExportHtmlword.php:272 @@ -10766,7 +10766,7 @@ msgstr "Stulpelis" #: libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php:38 msgctxt "Create new database" msgid "New" -msgstr "" +msgstr "Nauja" #: libraries/classes/Navigation/Nodes/NodeDatabase.php:42 #, fuzzy @@ -10783,7 +10783,7 @@ msgstr "Rodyti indeksus" #: libraries/classes/Navigation/Nodes/NodeEventContainer.php:33 msgctxt "Create new event" msgid "New" -msgstr "" +msgstr "Naujas" #: libraries/classes/Navigation/Nodes/NodeEvent.php:28 #: libraries/classes/Plugins/Export/ExportHtmlword.php:475 @@ -10837,12 +10837,12 @@ msgstr "Procedūros" #: libraries/classes/Navigation/Nodes/NodeTableContainer.php:34 msgctxt "Create new table" msgid "New" -msgstr "" +msgstr "Nauja" #: libraries/classes/Navigation/Nodes/NodeTriggerContainer.php:33 msgctxt "Create new trigger" msgid "New" -msgstr "" +msgstr "Naujas" #: libraries/classes/Navigation/Nodes/NodeTrigger.php:28 msgid "Trigger" From 91520d713ca554b625a62770903aaed5f0e64f4d Mon Sep 17 00:00:00 2001 From: "Kristijan \\\"Fremen\\\" Velkovski" Date: Thu, 16 Feb 2023 01:13:34 +0000 Subject: [PATCH 02/11] Translated using Weblate (Macedonian) Currently translated at 26.2% (899 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/ Signed-off-by: "Kristijan \"Fremen\" Velkovski" --- po/mk.po | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/po/mk.po b/po/mk.po index 2026617848..1c64815fa3 100644 --- a/po/mk.po +++ b/po/mk.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2023-02-08 15:09+0000\n" -"PO-Revision-Date: 2023-02-02 11:39+0000\n" -"Last-Translator: Kristijan Fremen Velkovski \n" -"Language-Team: Macedonian \n" +"PO-Revision-Date: 2023-02-17 01:46+0000\n" +"Last-Translator: \"Kristijan \\\"Fremen\\\" Velkovski\" \n" +"Language-Team: Macedonian \n" "Language: mk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -122,6 +122,8 @@ msgid "" "It is suggested to set {long_query_time} to a lower value, depending on your " "environment. Usually a value of 1-5 seconds is suggested." msgstr "" +"Се предлага да го подесите {long_query_time} на пониска вредност, во " +"зависност од вашата околина. Обично вредност од 1 до 5 секунди е предложена." #: libraries/advisory_rules_generic.php:74 #, php-format @@ -143,6 +145,8 @@ msgid "" "Enable slow query logging by setting {log_slow_queries} to 'ON'. This will " "help troubleshooting badly performing queries." msgstr "" +"Овозможете евидентирање на бавни барања со подесувањето на {log_slow_queries}" +" на 'ON'. Ова ќе помогне да се најдат проблеми со барања со лошо извршување." #: libraries/advisory_rules_generic.php:88 msgid "log_slow_queries is set to 'OFF'" @@ -8114,7 +8118,7 @@ msgstr "Примарен" #: templates/table/structure/display_table_stats.twig:24 #: templates/table/tracking/structure_snapshot_columns.twig:27 msgid "Index" -msgstr "Клуч" +msgstr "Индекс" #: libraries/classes/Controllers/Table/Structure/MoveColumnsController.php:178 #, fuzzy @@ -9414,7 +9418,7 @@ msgstr "Функција" #: templates/table/tracking/structure_snapshot_indexes.twig:6 #: templates/table/zoom_search/index.twig:37 msgid "Type" -msgstr "Вид" +msgstr "Тип" #: libraries/classes/InsertEdit.php:725 templates/import.twig:60 #: templates/import.twig:85 From 75d1e2f3a0c8a393166d1d3858c00a31916da073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20Pazo=C5=82a?= Date: Tue, 14 Feb 2023 09:11:21 +0000 Subject: [PATCH 03/11] Translated using Weblate (Polish) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 45.8% (1570 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/pl/ Signed-off-by: Bartosz Pazoła --- po/pl.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/pl.po b/po/pl.po index 6230b4c076..5d299d3d25 100644 --- a/po/pl.po +++ b/po/pl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2023-02-08 15:09+0000\n" -"PO-Revision-Date: 2023-02-12 06:12+0000\n" +"PO-Revision-Date: 2023-02-17 01:46+0000\n" "Last-Translator: Bartosz Pazoła \n" "Language-Team: Polish \n" @@ -62,7 +62,6 @@ msgid "Current amount of Questions: %s" msgstr "Aktualna liczba zapytań: %s" #: libraries/advisory_rules_generic.php:37 -#, fuzzy msgid "Percentage of slow queries" msgstr "Procent powolnych zapytań" @@ -11097,7 +11096,7 @@ msgid "Plugins" msgstr "Wtyczki" #: libraries/classes/Message.php:252 -#, fuzzy, php-format +#, php-format msgid "%1$d row affected." msgid_plural "%1$d rows affected." msgstr[0] "Zmodyfikowanych rekordów: %1$d." @@ -15817,7 +15816,6 @@ msgstr "Po zakończeniu zachować" #: templates/database/routines/editor_form.twig:142 #: templates/database/triggers/editor_form.twig:61 #: templates/view_create.twig:45 -#, fuzzy msgid "Definer" msgstr "Definiujący" @@ -16356,12 +16354,11 @@ msgstr[1] "%1$s dopasowania w %2$s" msgstr[2] "%1$s dopasowań w %2$s" #: templates/database/search/results.twig:56 -#, fuzzy msgid "Total: %count% match" msgid_plural "Total: %count% matches" -msgstr[0] "Ogółem: %s dopasowania" +msgstr[0] "Ogółem: %s dopasowanie" msgstr[1] "Ogółem: %s dopasowania" -msgstr[2] "Ogółem: %s dopasowania" +msgstr[2] "Ogółem: %s dopasowań" #: templates/database/structure/add_prefix.twig:7 #: templates/database/structure/add_prefix.twig:9 @@ -18259,7 +18256,6 @@ msgid "Configurable menus:" msgstr "Konfigurowalne menu:" #: templates/relation/check_relations.twig:408 -#, fuzzy msgid "Hide/show navigation items:" msgstr "Ukryj/pokaż elementy nawigacyjne:" @@ -20300,7 +20296,6 @@ msgid "table-specific" msgstr "specyficzne dla tabeli" #: templates/table/relation/common_form.twig:9 -#, fuzzy msgid "Foreign key constraints" msgstr "Ograniczenia klucza obcego" @@ -20332,7 +20327,6 @@ msgstr "" "Wyświetlane będą tylko kolumny z indeksem. Możesz zdefiniować indeks poniżej." #: templates/table/relation/common_form.twig:28 -#, fuzzy msgid "Foreign key constraint" msgstr "Ograniczenie klucza obcego" From 8cf677593857a6724aa9ced162c927a63075a66b Mon Sep 17 00:00:00 2001 From: "Kristijan \\\"Fremen\\\" Velkovski" Date: Fri, 17 Feb 2023 05:12:37 +0000 Subject: [PATCH 04/11] Translated using Weblate (Macedonian) Currently translated at 26.4% (907 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/ Signed-off-by: "Kristijan \"Fremen\" Velkovski" --- po/mk.po | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/po/mk.po b/po/mk.po index 1c64815fa3..f66e97e195 100644 --- a/po/mk.po +++ b/po/mk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2023-02-08 15:09+0000\n" -"PO-Revision-Date: 2023-02-17 01:46+0000\n" +"PO-Revision-Date: 2023-02-17 10:24+0000\n" "Last-Translator: \"Kristijan \\\"Fremen\\\" Velkovski\" \n" "Language-Team: Macedonian \n" @@ -3290,9 +3290,8 @@ msgstr "Табели" #: libraries/classes/Config/Descriptions.php:764 #: libraries/classes/Config/Forms/User/MainForm.php:90 #: templates/preferences/header.twig:36 -#, fuzzy msgid "Main panel" -msgstr "Додади ново поле" +msgstr "Главен панел" #: libraries/classes/Config/Descriptions.php:765 #, fuzzy @@ -3360,9 +3359,8 @@ msgid "Startup" msgstr "Статус" #: libraries/classes/Config/Descriptions.php:779 -#, fuzzy msgid "Database structure" -msgstr "База на податоци" +msgstr "Структура на база на податоци" #: libraries/classes/Config/Descriptions.php:780 #: libraries/classes/Plugins/Export/ExportPdf.php:267 @@ -3382,9 +3380,8 @@ msgid "Display relational schema" msgstr "Релациона шема" #: libraries/classes/Config/Descriptions.php:783 -#, fuzzy msgid "Text fields" -msgstr "Користи текст поле" +msgstr "Текст полиња" #: libraries/classes/Config/Descriptions.php:784 msgid "Texy! text" @@ -4245,9 +4242,8 @@ msgstr "Измените се сочувани" #: libraries/classes/Config/Descriptions.php:977 #: templates/console/display.twig:153 -#, fuzzy msgid "Show query history at start" -msgstr "SQL упит" +msgstr "Покажи историја на барања на старт" #: libraries/classes/Config/Descriptions.php:978 #: templates/console/display.twig:149 @@ -4265,9 +4261,8 @@ msgstr "" #: libraries/classes/Config/Descriptions.php:981 #: templates/console/display.twig:168 -#, fuzzy msgid "Switch to dark theme" -msgstr "Премини на копираната табела" +msgstr "Префрли во темна тема" #: libraries/classes/Config/Descriptions.php:982 msgid "Console height" @@ -4710,9 +4705,8 @@ msgid "No bookmarks" msgstr "Пребарување" #: libraries/classes/Console.php:128 -#, fuzzy msgid "SQL Query Console" -msgstr "SQL упит" +msgstr "Конзола за SQL барања" #: libraries/classes/Controllers/AbstractController.php:73 #: libraries/classes/Controllers/JavaScriptMessagesController.php:343 @@ -13416,9 +13410,8 @@ msgid "History" msgstr "SQL историја" #: templates/console/display.twig:11 templates/console/display.twig:99 -#, fuzzy msgid "Bookmarks" -msgstr "Пребарување" +msgstr "Обележувачи" #: templates/console/display.twig:20 #, fuzzy @@ -16188,9 +16181,8 @@ msgid "There are no favorite tables." msgstr "Серверот не одговара" #: templates/relation/check_relations.twig:3 -#, fuzzy msgid "phpMyAdmin configuration storage" -msgstr "phpMyAdmin документација" +msgstr "phpMyAdmin складирање на конфигурации" #: templates/relation/check_relations.twig:9 msgid "Configuration of pmadb…" From d525a722b1a01e1a2bcaf887a78a133d0d43c790 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 15 Feb 2023 14:01:20 +0100 Subject: [PATCH 05/11] Add autocomplete attribute to password inputs to change password Signed-off-by: William Desportes --- templates/server/privileges/change_password.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/server/privileges/change_password.twig b/templates/server/privileges/change_password.twig index 7216ec674e..50eb793bf1 100644 --- a/templates/server/privileges/change_password.twig +++ b/templates/server/privileges/change_password.twig @@ -24,13 +24,13 @@ {% trans 'Enter:' %}      + onchange="nopass[1].checked = true" autocomplete="new-password"> {% trans %}Strength:{% context %}Password strength{% endtrans %}
{% trans 'Re-type:' %}  - + From f503b10dc3ab2c8eb80dba990b3914e67ea726a4 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 19 Feb 2023 12:39:38 +0100 Subject: [PATCH 06/11] Fix #18109 - release script for CI versions Fixes: #18109 The issue was that roave/security-advisories did block any versions before 5.2.1. So I extended 5.2+ci to 5.2.1+ci Signed-off-by: William Desportes --- scripts/create-release.sh | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 389b435a2b..3ff723d1e5 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -58,7 +58,6 @@ while [ $# -gt 0 ] ; do git branch ci branch="ci" fi - version="${VERSION_SERIES}+ci" ;; --help) echo "Usages:" @@ -96,8 +95,13 @@ while [ $# -gt 0 ] ; do shift done -if [ -z "$version" -o -z "$branch" ] ; then - echo "Branch and version have to be specified!" +if [ -z "$branch" ]; then + echo "Branch must be specified!" + exit 1 +fi + +if [ -z "$version" && $do_ci -eq 0 ]; then + echo "Version must be specified!" exit 1 fi @@ -361,15 +365,22 @@ VERSION_FILE=libraries/classes/Version.php # Keep in sync with update-po script fetchReleaseFromFile() { - php -r "define('VERSION_SUFFIX', ''); require_once('libraries/classes/Version.php'); echo \PhpMyAdmin\Version::VERSION;" + SUFFIX="${1:-}" + php -r "define('VERSION_SUFFIX', '$SUFFIX'); require_once('$VERSION_FILE'); echo \PhpMyAdmin\Version::VERSION;" } fetchVersionSeriesFromFile() { - php -r "define('VERSION_SUFFIX', ''); require_once('libraries/classes/Version.php'); echo \PhpMyAdmin\Version::SERIES;" + php -r "define('VERSION_SUFFIX', ''); require_once('$VERSION_FILE'); echo \PhpMyAdmin\Version::SERIES;" } +VERSION_FROM_FILE="$(fetchReleaseFromFile)" VERSION_SERIES_FROM_FILE="$(fetchVersionSeriesFromFile)" +if [ $do_ci -eq 1 ]; then + VERSION_FROM_FILE="$(fetchReleaseFromFile '+ci')" + version="${VERSION_FROM_FILE}" +fi + if [ "${VERSION_SERIES_FROM_FILE}" != "${VERSION_SERIES}" ]; then echo "This script can not handle ${VERSION_SERIES_FROM_FILE} version series." echo "Only ${VERSION_SERIES} version series are allowed, please use your target branch directly or another branch." @@ -377,7 +388,8 @@ if [ "${VERSION_SERIES_FROM_FILE}" != "${VERSION_SERIES}" ]; then exit 1; fi -echo "The actual configured release is: $(fetchReleaseFromFile)" +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 cat < Date: Sun, 19 Feb 2023 12:58:42 +0100 Subject: [PATCH 07/11] Fix the snapshot version generation And fix my mistakes For the same reasons as f503b10dc3ab2c8eb80dba990b3914e67ea726a4 Signed-off-by: William Desportes --- scripts/create-release.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 3ff723d1e5..168ee8f7bc 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -100,7 +100,7 @@ if [ -z "$branch" ]; then exit 1 fi -if [ -z "$version" && $do_ci -eq 0 ]; then +if [ -z "$version" -a $do_ci -eq 0 ]; then echo "Version must be specified!" exit 1 fi @@ -391,7 +391,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 -a $do_daily -eq 0 ] ; then cat < '.*'/'versionSuffix' => '+$today_date.$git_head_short'/" libraries/vendor_config.php php -l libraries/vendor_config.php + + # Fetch it back and refresh $version + VERSION_FROM_FILE="$(fetchReleaseFromFile "+$today_date.$git_head_short")" + version="${VERSION_FROM_FILE}" + echo "The actual configured release is: $VERSION_FROM_FILE" fi # Check release version From 67e18b73547f92c1172ad270bca322fa6716531b Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 19 Feb 2023 13:16:47 +0100 Subject: [PATCH 08/11] Fix copy action in create-release.sh Signed-off-by: William Desportes --- scripts/create-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 168ee8f7bc..263078e41f 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -618,7 +618,7 @@ for kit in $KITS ; do echo "* Building kit: $kit" # Copy all files name=phpMyAdmin-$version-$kit - cp -r phpMyAdmin-$version $name + cp -r $workdir $name # Cleanup translations cd phpMyAdmin-$version-$kit From de35195d3c3cbda9c00d816f4ead96e57803d5e3 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 19 Feb 2023 13:16:26 +0100 Subject: [PATCH 09/11] Improve testGetTempDir and testGetUploadTempDir tests Signed-off-by: William Desportes --- test/classes/ConfigTest.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php index e48bd94958..73c368ac10 100644 --- a/test/classes/ConfigTest.php +++ b/test/classes/ConfigTest.php @@ -1034,10 +1034,14 @@ class ConfigTest extends AbstractTestCase */ public function testGetTempDir(): void { - $this->object->set('TempDir', sys_get_temp_dir() . DIRECTORY_SEPARATOR); + $dir = realpath(sys_get_temp_dir()); + $this->assertDirectoryExists($dir); + $this->assertDirectoryIsWritable($dir); + + $this->object->set('TempDir', $dir . DIRECTORY_SEPARATOR); // Check no double slash is here $this->assertEquals( - sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'upload', + $dir . DIRECTORY_SEPARATOR . 'upload', $this->object->getTempDir('upload') ); } @@ -1046,10 +1050,15 @@ class ConfigTest extends AbstractTestCase * Test for getUploadTempDir * * @group file-system + * @depends testGetTempDir */ public function testGetUploadTempDir(): void { - $this->object->set('TempDir', realpath(sys_get_temp_dir()) . DIRECTORY_SEPARATOR); + $dir = realpath(sys_get_temp_dir()); + $this->assertDirectoryExists($dir); + $this->assertDirectoryIsWritable($dir); + + $this->object->set('TempDir', $dir . DIRECTORY_SEPARATOR); $this->assertEquals( $this->object->getTempDir('upload'), From 3ca687a35c7baad14cbb28c90854fa416e91c0d6 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 19 Feb 2023 13:36:17 +0100 Subject: [PATCH 10/11] Fix folder management and building kits in create-release.sh Fixes 67e18b73547f92c1172ad270bca322fa6716531b where it was a bit wrong + typo fix Signed-off-by: William Desportes --- scripts/create-release.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 263078e41f..2500127aad 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -105,6 +105,8 @@ if [ -z "$version" -a $do_ci -eq 0 ]; then exit 1 fi +kit_prefix="phpMyAdmin-$version" + # Checks whether remote branch has local tracking branch ensure_local_branch() { if ! git branch | grep -q '^..'"$1"'$' ; then @@ -418,9 +420,10 @@ fi # Create working copy mkdir -p release git worktree prune -workdir=release/phpMyAdmin-$version +workdir_name=phpMyAdmin-$version +workdir=release/$workdir_name if [ -d $workdir ] ; then - echo "Working directory '$workdir' already exists, please move it out of way" + echo "Working directory '$workdir' already exists, please move it out of the way" exit 1 fi @@ -468,7 +471,7 @@ if [ $do_ci -eq 0 -a -$do_daily -eq 0 ] ; then fi # Cleanup release dir -LC_ALL=C date -u > RELEASE-DATE-${version} +LC_ALL=C date -u > RELEASE-DATE-$version # Building documentation echo "* Generating documentation" @@ -617,11 +620,11 @@ cd .. for kit in $KITS ; do echo "* Building kit: $kit" # Copy all files - name=phpMyAdmin-$version-$kit - cp -r $workdir $name + name=$kit_prefix-$kit + cp -r $workdir_name $name # Cleanup translations - cd phpMyAdmin-$version-$kit + cd $name ./scripts/lang-cleanup.sh $kit # Remove tests, source code,... @@ -693,12 +696,12 @@ for kit in $KITS ; do done # Cleanup -rm -r phpMyAdmin-${version} +rm -r $workdir_name git worktree prune # Signing of files with default GPG key echo "* Signing files" -for file in phpMyAdmin-$version-*.gz phpMyAdmin-$version-*.zip phpMyAdmin-$version-*.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 fi @@ -707,7 +710,7 @@ for file in phpMyAdmin-$version-*.gz phpMyAdmin-$version-*.zip phpMyAdmin-$versi done if [ $do_daily -eq 1 ] ; then - cat > phpMyAdmin-${version}.json << EOT + cat > $kit_prefix.json << EOT { "date": "`date --iso-8601=seconds`", "commit": "$git_head" From 45c4152c4acba3daaeaf3abe740b397c17a3db30 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 19 Feb 2023 13:48:27 +0100 Subject: [PATCH 11/11] Output the version of sphinx-build in create-release.sh Signed-off-by: William Desportes --- scripts/create-release.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 2500127aad..19d532e170 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -474,6 +474,7 @@ fi LC_ALL=C date -u > RELEASE-DATE-$version # Building documentation +echo "* Running sphinx-build (version: $(sphinx-build --version))" echo "* Generating documentation" LC_ALL=C make -C doc html find doc -name '*.pyc' -print0 | xargs -0 -r rm -f