From 5a5ecb3ee31362a62d71215dd22b0e5a68fafb10 Mon Sep 17 00:00:00 2001
From: wh1te909 <dcparsi@gmail.com>
Date: Wed, 30 Dec 2020 19:04:14 +0000
Subject: [PATCH] install curl/wget first fixes #224

---
 install.sh | 6 +++---
 restore.sh | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/install.sh b/install.sh
index dce7d010..580bbf30 100644
--- a/install.sh
+++ b/install.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 
-SCRIPT_VERSION="29"
+SCRIPT_VERSION="30"
 SCRIPT_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/master/install.sh'
 
+sudo apt install -y curl wget
+
 GREEN='\033[0;32m'
 YELLOW='\033[1;33m'
 BLUE='\033[0;34m'
@@ -189,8 +191,6 @@ echo "saltapi:${SALTPW}" | sudo chpasswd
 
 print_green 'Installing golang'
 
-sudo apt install -y curl wget
-
 sudo mkdir -p /usr/local/rmmgo
 go_tmp=$(mktemp -d -t rmmgo-XXXXXXXXXX)
 wget https://golang.org/dl/go1.15.5.linux-amd64.tar.gz -P ${go_tmp}
diff --git a/restore.sh b/restore.sh
index ff1722fc..e97b61b7 100755
--- a/restore.sh
+++ b/restore.sh
@@ -7,9 +7,11 @@ pgpw="hunter2"
 
 #####################################################
 
-SCRIPT_VERSION="10"
+SCRIPT_VERSION="11"
 SCRIPT_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/master/restore.sh'
 
+sudo apt install -y curl wget
+
 GREEN='\033[0;32m'
 YELLOW='\033[1;33m'
 BLUE='\033[0;34m'
@@ -90,7 +92,6 @@ sudo systemctl restart systemd-journald.service
 print_green 'Installing golang'
 
 sudo apt update
-sudo apt install -y curl wget
 sudo mkdir -p /usr/local/rmmgo
 go_tmp=$(mktemp -d -t rmmgo-XXXXXXXXXX)
 wget https://golang.org/dl/go1.15.5.linux-amd64.tar.gz -P ${go_tmp}