From 3c96b69af1f6aea2259fea89968d1e081ea9012f Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 5 Nov 2022 12:12:38 -0500
Subject: [PATCH] Update linupx-scripts.sh

---
 linupx-scripts.sh | 37 +++++++++----------------------------
 1 file changed, 9 insertions(+), 28 deletions(-)

diff --git a/linupx-scripts.sh b/linupx-scripts.sh
index e6546c3..783a4b2 100755
--- a/linupx-scripts.sh
+++ b/linupx-scripts.sh
@@ -408,41 +408,22 @@ IPERF_INSTALL() {
 		read -n 1 -s -p "Press any key to continue";;
 	esac
 }
-IPERF_INSTALL() {
-	read -n 1 -p "Are you sure you wish to install iPerf (Y/n)?" choice
+SPEEDTEST_INSTALL() {
+	read -n 1 -p "Are you sure you wish to install SpeedTest (Y/n)?" choice
 	case "$choice" in 
 	[Nn]) INSTALL_MENU;;
 	* )
 		echo ""
 		
-		cd /tmp
-		wget https://downloads.es.net/pub/iperf/iperf-3.10.1.tar.gz
-		tar -zxhf iperf-3.10.1.tar.gz
-		cd /tmp/iperf-3.10.1
-		./configure
-		make
-		make install
-		ldconfig
+		$APTFUNC remove -y -qq speedtest speedtest-cli >/dev/null 2&>1
+		pip uninstall speedtest speedtest-cli -y >/dev/null 2&>1
+		rm /usr/local/bin/speedtest-cli >/dev/null 2&>1
+		apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8E61C2AB9A6D1557
+		curl -s https://install.speedtest.net/app/cli/install.deb.sh | sudo bash
+		$APTFUNC install -y speedtest
 		
 		echo ""
-		echo -e "${Green}iPerf has been Installed${Color_Off}"
-		if [ ${action-x} ]; then exit 0; fi
-		read -n 1 -s -p "Press any key to continue";;
-	esac
-}
-CHANGECOPYCERTS_INSTALL() {
-	read -n 1 -p "Are you sure you wish to change SSL servers (Y/n)?" choice
-	case "$choice" in 
-	[Nn]) INSTALL_MENU;;
-	* )
-		echo ""
-		
-		ssh-copy-id le@keepalived.scity.us
-		sed -i 's/scp le@webserver.scity.us:\/etc\/letsencrypt\/live/scp le@keepalived.scity.us:\/opt\/nginx-proxy\/ssl/' /opt/copycerts.sh
-		/opt/copycerts.sh
-		
-		echo ""
-		echo -e "${Green}copycerts.sh has been updated${Color_Off}"
+		echo -e "${Green}SpeedTest has been Installed${Color_Off}"
 		echo ""
 		echo -e "${LightCyan}To run, use the command: speedtest${Color_Off}"
 		if [ ${action-x} ]; then exit 0; fi