From 488c31717b3ae50edae3778d3e180b4a79ef34c7 Mon Sep 17 00:00:00 2001
From: Ilia Ross <ilia@ross.gdn>
Date: Wed, 20 Sep 2023 21:17:35 +0300
Subject: [PATCH] Fix to abstract lib URL

---
 virtualmin-install.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/virtualmin-install.sh b/virtualmin-install.sh
index 34f08bb..a45b28b 100644
--- a/virtualmin-install.sh
+++ b/virtualmin-install.sh
@@ -23,7 +23,8 @@ vm_version=7
 
 # Server
 upgrade_virtualmin_host=software.virtualmin.com
-upgrade_virtualmin_host_mods="$upgrade_virtualmin_host/lib/mods"
+upgrade_virtualmin_host_lib="$upgrade_virtualmin_host/lib"
+upgrade_virtualmin_host_mods="$upgrade_virtualmin_host_lib/mods"
 
 # Currently supported systems
 # https://www.virtualmin.com/os-support/
@@ -295,7 +296,7 @@ download_slib() {
   else
     # We need HTTP client first
     pre_check_http_client
-    $download "https://$upgrade_virtualmin_host/lib/slib.sh" >>"$log" 2>&1
+    $download "https://$upgrade_virtualmin_host_lib/slib.sh" >>"$log" 2>&1
     if [ $? -ne 0 ]; then
       echo "Error: Failed to download utility function library. Cannot continue. Check your network connection and DNS settings."
       exit 1
@@ -1138,10 +1139,10 @@ install_virtualmin_release() {
 
     # Install our keys
     log_debug "Installing Webmin and Virtualmin package signing keys .."
-    download "https://$upgrade_virtualmin_host/lib/RPM-GPG-KEY-virtualmin-$vm_version" "Downloading Virtualmin $vm_version key"
+    download "https://$upgrade_virtualmin_host_lib/RPM-GPG-KEY-virtualmin-$vm_version" "Downloading Virtualmin $vm_version key"
     run_ok "gpg --import RPM-GPG-KEY-virtualmin-$vm_version && cat RPM-GPG-KEY-virtualmin-$vm_version | gpg --dearmor > /usr/share/keyrings/$repoid_debian_like-virtualmin-$vm_version.gpg" "Installing Virtualmin $vm_version key"
     if [ "$vm6_repos" -eq 1 ]; then
-      download "https://$upgrade_virtualmin_host/lib/RPM-GPG-KEY-webmin" "Downloading Webmin key"
+      download "https://$upgrade_virtualmin_host_lib/RPM-GPG-KEY-webmin" "Downloading Webmin key"
       run_ok "gpg --import RPM-GPG-KEY-webmin && cat RPM-GPG-KEY-webmin | gpg --dearmor > /usr/share/keyrings/$repoid_debian_like-webmin.gpg" "Installing Webmin key"
     fi
     run_ok "apt-get update" "Downloading repository metadata"