From b18019652388a315de1bb2e163e2a9a5fe6d49dd Mon Sep 17 00:00:00 2001 From: Marek Miklewicz Date: Sun, 5 Jul 2026 22:09:51 +0200 Subject: [PATCH] Bump version to 1.2.19 Also fixes a stale usage-text assertion in package_archive_test.sh that still expected the old form (install_db_cli_test.sh was already updated for the now-optional PORT, but this archive-level check was missed until repackaging surfaced it against fresh content). --- plugin.conf | 2 +- tests/package_archive_test.sh | 8 ++++---- tests/plugin_identity_test.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugin.conf b/plugin.conf index dd90be1..02b7c9e 100644 --- a/plugin.conf +++ b/plugin.conf @@ -2,7 +2,7 @@ name=alt-mysql id=alt-mysql type=user author=HITME.PL -version=1.2.18 +version=1.2.19 active=no installed=no user_run_as=root diff --git a/tests/package_archive_test.sh b/tests/package_archive_test.sh index 25d9a8b..868aaa2 100644 --- a/tests/package_archive_test.sh +++ b/tests/package_archive_test.sh @@ -2,7 +2,7 @@ set -euo pipefail PLUGIN_DIR="$(cd "$(dirname "$0")/.." && pwd)" -ARCHIVE="${1:-$(cd "$PLUGIN_DIR/.." && pwd)/archives/1.2.18/alt-mysql.tar.gz}" +ARCHIVE="${1:-$(cd "$PLUGIN_DIR/.." && pwd)/archives/1.2.19/alt-mysql.tar.gz}" fail() { echo "FAIL: $*" >&2 @@ -40,7 +40,7 @@ fi CONF="$(tar -xOzf "$ARCHIVE" ./plugin.conf 2>/dev/null || tar -xOzf "$ARCHIVE" plugin.conf)" printf '%s\n' "$CONF" | grep -Fxq "name=alt-mysql" || fail "archive plugin name is not alt-mysql" printf '%s\n' "$CONF" | grep -Fxq "id=alt-mysql" || fail "archive plugin id is not alt-mysql" -printf '%s\n' "$CONF" | grep -Fxq "version=1.2.18" || fail "archive plugin version is not 1.2.18" +printf '%s\n' "$CONF" | grep -Fxq "version=1.2.19" || fail "archive plugin version is not 1.2.19" SETTINGS="$(tar -xOzf "$ARCHIVE" ./plugin-settings.conf 2>/dev/null || tar -xOzf "$ARCHIVE" plugin-settings.conf)" printf '%s\n' "$SETTINGS" | grep -Fxq "PHPMYADMIN_INSTALL_DIR=/var/www/html/alt-mysql-phpmyadmin" \ @@ -69,8 +69,8 @@ printf '%s\n' "$DB_INSTALLER" | grep -Fq 'SKIP_PLUGIN_INSTALL_REFRESH' \ || fail "archive install_db.sh does not expose a test/maintenance escape hatch for plugin refresh" printf '%s\n' "$DB_INSTALLER" | grep -Fq '[[ $# -eq 0 ]]' \ || fail "archive install_db.sh does not show usage when called without arguments" -printf '%s\n' "$DB_INSTALLER" | grep -Fq ' ' \ - || fail "archive install_db.sh usage does not require version and port" +printf '%s\n' "$DB_INSTALLER" | grep -Fq ' [PORT]' \ + || fail "archive install_db.sh usage does not show optional port" INSTALLER="$(tar -xOzf "$ARCHIVE" ./scripts/setup/phpmyadmin_install.sh 2>/dev/null || tar -xOzf "$ARCHIVE" scripts/setup/phpmyadmin_install.sh)" printf '%s\n' "$INSTALLER" | grep -Fq "\$cfg['Servers'][\$i]['SignonURL'] = da_mysql_phpmyadmin_signon_url(\$runtimeConfig);" \ diff --git a/tests/plugin_identity_test.sh b/tests/plugin_identity_test.sh index 6a6b430..c36a11c 100644 --- a/tests/plugin_identity_test.sh +++ b/tests/plugin_identity_test.sh @@ -14,7 +14,7 @@ case "$(basename "$PLUGIN_DIR")" in esac grep -Fxq "name=alt-mysql" "$PLUGIN_DIR/plugin.conf" || fail "plugin.conf name is not alt-mysql" grep -Fxq "id=alt-mysql" "$PLUGIN_DIR/plugin.conf" || fail "plugin.conf id is not alt-mysql" -grep -Fxq "version=1.2.18" "$PLUGIN_DIR/plugin.conf" || fail "plugin.conf version is not 1.2.18" +grep -Fxq "version=1.2.19" "$PLUGIN_DIR/plugin.conf" || fail "plugin.conf version is not 1.2.19" grep -Fq "return '/CMD_PLUGINS/alt-mysql';" "$PLUGIN_DIR/exec/lib/AppContext.php" \ || fail "AppContext base URL is not alt-mysql" grep -Fq "\$pluginId = 'alt-mysql';" "$PLUGIN_DIR/exec/lib/DirectAdminUser.php" \