From 9ac2a45822ad951a6a87f9468c714b981b0b6110 Mon Sep 17 00:00:00 2001
From: Ilia Ross <ilia@ross.gdn>
Date: Sun, 29 Dec 2024 03:28:54 +0200
Subject: [PATCH] Fix to use a consistent flag name

---
 .github/build/deb.sh                                   | 8 +++-----
 .github/build/rpm.sh                                   | 8 +++-----
 .github/workflows/webmin.dev-deploy-webmin-package.yml | 4 ++--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.github/build/deb.sh b/.github/build/deb.sh
index 2d216dfa5..4a9ace780 100755
--- a/.github/build/deb.sh
+++ b/.github/build/deb.sh
@@ -16,7 +16,7 @@
 #
 #   # Pull and build devel versions
 #   # of both Webmin and Usermin
-#      ./deb.sh --devel
+#      ./deb.sh --testing
 #
 #   # Pull and build production Webmin version 2.101, forcing
 #   # release version 3, displaying detailed output
@@ -42,7 +42,7 @@ build_prod() {
 
     # Pack with English only in devel builds
     local english_only=0
-    if [[ "'$*'" == *"--devel"* ]]; then
+    if [[ "'$*'" == *"--testing"* ]]; then
         english_only=1
     fi
 
@@ -113,7 +113,7 @@ build_prod() {
     if [ -z "$ver" ]; then
         ver=$(get_current_repo_tag)
     fi
-    if [[ "'$*'" == *"--devel"* ]]; then
+    if [[ "'$*'" == *"--testing"* ]]; then
         ver="$ver.$date_version"
         # Set actual product version
         echo "${ver}" >"version"
@@ -194,8 +194,6 @@ build_prod() {
     echo "Preparing built files for upload .."
     cmd="cp -f $root_prod/tarballs/${prod}-${ver}*\.tar.gz $root_repos/${prod}-latest.tar.gz $verbosity_level"
     eval "$cmd"
-    cmd="echo $ver-$rel \($date\) > $root_repos/${prod}-latest.version $verbosity_level_to_file"
-    eval "$cmd"
     cmd="find $root_apt -name ${prod}_${ver}${relval}*\.deb -exec mv '{}' $root_repos \; $verbosity_level"
     eval "$cmd"
     cmd="mv -f $root_repos/${prod}_${ver}${relval}*\.deb $root_repos/${prod}-latest.deb $verbosity_level"
diff --git a/.github/build/rpm.sh b/.github/build/rpm.sh
index aea17783a..f4fe5d9f3 100755
--- a/.github/build/rpm.sh
+++ b/.github/build/rpm.sh
@@ -16,7 +16,7 @@
 #
 #   # Pull and build devel versions
 #   # of both Webmin and Usermin
-#      ./rpm.sh --devel
+#      ./rpm.sh --testing
 #
 #   # Pull and build production Webmin version 2.101, forcing
 #   # release version 3, displaying detailed output
@@ -42,7 +42,7 @@ build_prod() {
 
     # Pack with English only in devel builds
     local english_only=0
-    if [[ "'$*'" == *"--devel"* ]]; then
+    if [[ "'$*'" == *"--testing"* ]]; then
         english_only=1
     fi
 
@@ -110,7 +110,7 @@ build_prod() {
     if [ -z "$ver" ]; then
         ver=$(get_current_repo_tag)
     fi
-    if [[ "'$*'" == *"--devel"* ]]; then
+    if [[ "'$*'" == *"--testing"* ]]; then
         ver="$ver.$date_version"
         # Set actual product version
         echo "${ver}" >"version"
@@ -206,8 +206,6 @@ build_prod() {
     echo "Preparing built files for upload .."
     cmd="cp -f $root_prod/tarballs/$prod-$ver*\.tar.gz $root_repos/${prod}-latest.tar.gz $verbosity_level"
     eval "$cmd"
-    cmd="echo $ver-$rel \($date\) > $root_repos/$prod-latest.version"
-    eval "$cmd"
     cmd="find $root_rpms -name $prod-$ver-$rel*\.rpm -exec mv '{}' $root_repos \; $verbosity_level"
     eval "$cmd"
     cmd="mv -f $root_repos/$prod-$ver-$rel*\.rpm $root_repos/${prod}-latest.rpm $verbosity_level"
diff --git a/.github/workflows/webmin.dev-deploy-webmin-package.yml b/.github/workflows/webmin.dev-deploy-webmin-package.yml
index 4ea7fbe1a..d788b8502 100644
--- a/.github/workflows/webmin.dev-deploy-webmin-package.yml
+++ b/.github/workflows/webmin.dev-deploy-webmin-package.yml
@@ -26,5 +26,5 @@ jobs:
           ENV_BUILD__CLOUD_UPLOAD_SSH_HOST: ${{ secrets.WEBMIN_DEV__IP_ADDR }}
         working-directory: ./.github/build
         run: |-
-          ./deb.sh webmin --devel
-          ./rpm.sh webmin --devel
+          ./deb.sh webmin --testing
+          ./rpm.sh webmin --testing