CHANGELOG.md

@@ -4,13 +4,6 @@
 
 - All LXC instances created using this repository come pre-installed with Midnight Commander, which is a command-line tool (`mc`) that offers a user-friendly file and directory management interface for the terminal environment.
 
-## 2023-08-09
-
-### Changed
-
-- **Omada Controller LXC**
-  - Update via script
-
 ## 2023-08-01
 
 ### Changed

ct/omada.sh

@@ -53,25 +53,20 @@ function default_settings() {
 function update_script() {
 header_info
 if [[ ! -d /opt/tplink ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
-latest_url=$(curl -fsSL "https://www.tp-link.com/us/support/download/omada-software-controller/" | grep -o 'https://.*x64.deb' | head -n1)
-latest_version=$(basename "${latest_url}" | sed -e 's/.*ller_//;s/_Li.*//')
-if [ -z "${latest_version}" ]; then
-  msg_error "It seems that the server (tp-link.com) might be down. Please try again at a later time."
-  exit
-fi
+latesturl=$(curl -fsSL "https://www.tp-link.com/us/support/download/omada-software-controller/" | grep -o 'https://.*x64.deb' | head -n1)
+latestversion=$(basename "$latesturl" | sed -e 's/.*ller_v//;s/_Li.*//')
 installed_version=$(dpkg -l | grep omada | awk '{print $3}')
 
-if [ "v${installed_version}" = "${latest_version}" ]; then
-  msg_info "Installed version (v${installed_version}) is the same as the latest version (${latest_version})"
-  sleep 2
-  msg_ok "Omada Controller is already up to date"
+if [ "$installed_version" = "$latestversion" ]; then
+  echo "Installed version ($installed_version) is the same as the latest version ($latestversion)."
+  echo "Omada is already up to date"
   exit
 else
-  echo -e "Updating Omada Controller to ${latest_version}"
-  wget -qL ${latest_url}
-  dpkg -i Omada_SDN_Controller_${latest_version}_Linux_x64.deb
-  rm -rf Omada_SDN_Controller_${latest_version}_Linux_x64.deb
-  echo -e "Updated Omada Controller to ${latest_version}"
+  echo -e "Updating Omada Controller to v${latestversion}"
+  wget -qL ${latesturl}
+  dpkg -i Omada_SDN_Controller_v${latestversion}_Linux_x64.deb
+  rm -rf Omada_SDN_Controller_v${latestversion}_Linux_x64.deb
+  echo -e "Updated Omada Controller to v${latestversion}"
 exit
 fi
 }

install/omada-install.sh

@@ -36,19 +36,19 @@ wget -qL https://repo.mongodb.org/apt/ubuntu/dists/bionic/mongodb-org/3.6/multiv
 $STD dpkg -i mongodb-org-server_3.6.23_amd64.deb
 msg_ok "Installed MongoDB"
 
-latest_url=$(curl -fsSL "https://www.tp-link.com/us/support/download/omada-software-controller/" | grep -o 'https://.*x64.deb' | head -n1)
-latest_version=$(basename "$latest_url" | sed -e 's/.*ller_//;s/_Li.*//')
+latesturl=$(curl -fsSL "https://www.tp-link.com/us/support/download/omada-software-controller/" | grep -o 'https://.*x64.deb' | head -n1)
+latestversion=$(basename "$latesturl" | sed -e 's/.*ller_v//;s/_Li.*//')
 
-msg_info "Installing Omada Controller ${latest_version}"
-wget -qL ${latest_url}
-$STD dpkg -i Omada_SDN_Controller_${latest_version}_Linux_x64.deb 
-msg_ok "Installed Omada Controller ${latest_version}"
+msg_info "Installing Omada Controller v${latestversion}"
+wget -qL ${latesturl}
+$STD dpkg -i Omada_SDN_Controller_v${latestversion}_Linux_x64.deb 
+msg_ok "Installed Omada Controller v${latestversion}"
 
 motd_ssh
 customize
 
 msg_info "Cleaning up"
-rm -rf Omada_SDN_Controller_${latest_version}_Linux_x64.deb mongodb-org-server_3.6.23_amd64.deb zulu-repo_1.0.0-3_all.deb libssl1.1_1.1.1f-1ubuntu2.19_amd64.deb
+rm -rf Omada_SDN_Controller_v${latestversion}_Linux_x64.deb mongodb-org-server_3.6.23_amd64.deb zulu-repo_1.0.0-3_all.deb libssl1.1_1.1.1f-1ubuntu2.19_amd64.deb
 $STD apt-get autoremove
 $STD apt-get autoclean
 msg_ok "Cleaned"