From 1b7c9bea0dfbb188179863c6575eda1397937254 Mon Sep 17 00:00:00 2001
From: Ilia Ross <ilia@ross.gdn>
Date: Sun, 14 Apr 2024 00:44:26 +0300
Subject: [PATCH] Dev: Fix builds to include EOL data properly [build]

---
 .github/build/vars.sh       | 7 +++++++
 makedist.pl                 | 2 +-
 os-eol.pl => os-eol-make.pl | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)
 rename os-eol.pl => os-eol-make.pl (79%)

diff --git a/.github/build/vars.sh b/.github/build/vars.sh
index e064269de..28a432a91 100755
--- a/.github/build/vars.sh
+++ b/.github/build/vars.sh
@@ -18,3 +18,10 @@ cloud_upload_ssh_host="${ENV_BUILD__CLOUD_UPLOAD_SSH_HOST:-webmin.dev}"
 cloud_upload_ssh_dir="${ENV_BUILD__CLOUD_UPLOAD_SSH_DIR:-~/domains/builds.webmin.dev/public_html}"
 cloud_upload_gpg_passphrase="${WEBMIN_DEV__GPG_PH}"
 
+# Define verbosity level
+verbosity_level=' >/dev/null 2>&1 </dev/null'
+verbosity_level_to_file='2> /dev/null'
+verbosity_level_with_input=' >/dev/null 2>&1'
+if [[ "'$*'" == *"--debug"* ]]; then
+    unset verbosity_level verbosity_level_to_file verbosity_level_with_input
+fi
diff --git a/makedist.pl b/makedist.pl
index 94e4cc5c7..9bd69313d 100755
--- a/makedist.pl
+++ b/makedist.pl
@@ -88,7 +88,7 @@ else {
 # Build EOL data
 if (-r "./webmin/os-eol-lib.pl") {
 	print "Building OS EOL data\n";
-	system("./os-eol.pl");
+	system("./os-eol-make.pl");
 	}
 
 # Prepare dist files
diff --git a/os-eol.pl b/os-eol-make.pl
similarity index 79%
rename from os-eol.pl
rename to os-eol-make.pl
index 14e94a7ec..9171ddb18 100755
--- a/os-eol.pl
+++ b/os-eol-make.pl
@@ -1,6 +1,9 @@
 #!/usr/local/bin/perl
 # Build EOL data JSON file
 
+if ($0 =~ /^(.*)\//) {
+	chdir($1);
+	}
 do "./web-lib-funcs.pl";
 do "./webmin/os-eol-lib.pl";
 &eol_build_all_os_data("./os_eol.json");