From 832386ff473ba0c2f1570e70a5ebb96c4643d818 Mon Sep 17 00:00:00 2001 From: ducoterra Date: Mon, 1 Oct 2018 09:04:55 -0400 Subject: [PATCH 1/7] remove rogue character --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 3d62089..7293511 100755 --- a/install.sh +++ b/install.sh @@ -23,7 +23,7 @@ fi # install dependencies packages=(gcc wget nginx ufw make sqlite3 bzip2 openssl libffi-dev libssl-dev libsqlite3-dev zlib1g-dev libbz2-dev libpq-dev) echo -e "\tRunning apt update" -apt update 1>> $aptlogloc 2>> $aptlogloc 3>> $aptlogloc +apt update 1> $aptlogloc 2>> $aptlogloc 3>> $aptlogloc for package in ${packages[@]}; do echo -e "\tInstalling $package" @@ -38,7 +38,7 @@ done ports=(22 80 443) for port in ${ports[@]}; do - echo -e "ufw allow $port/tcp" > 1>> $firelogloc 2>> $firelogloc + echo -e "ufw allow $port/tcp" 1>> $firelogloc 2>> $firelogloc ufw allow $port/tcp 1>> $firelogloc 2>> $firelogloc if [ $? -ne 0 ] ; then echo -e "\tfirewall failed to update port $port correctly. $firelogmsg" From 21662b97f2f4112f18d246e270a33577c90e2f51 Mon Sep 17 00:00:00 2001 From: ducoterra Date: Sun, 25 Nov 2018 16:20:08 -0500 Subject: [PATCH 2/7] switch to sudo user --- install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/install.sh b/install.sh index 7293511..fa90944 100755 --- a/install.sh +++ b/install.sh @@ -3,6 +3,9 @@ # Installs Dependencies automatically ################################################################################ +# switch to sudo user +sudo -s + # source vars source vars From 1f4081c6efe201ee199f00537ebe5b6bef21edb7 Mon Sep 17 00:00:00 2001 From: ducoterra Date: Sun, 25 Nov 2018 16:21:08 -0500 Subject: [PATCH 3/7] ./vars --- install.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install.sh b/install.sh index fa90944..f1cb2ad 100755 --- a/install.sh +++ b/install.sh @@ -4,10 +4,9 @@ ################################################################################ # switch to sudo user -sudo -s # source vars -source vars +./vars # check if root if [[ $EUID -ne 0 ]]; then From 6e907483a28323e3122ec4f7ee9fff0ebff0b46e Mon Sep 17 00:00:00 2001 From: ducoterra Date: Sun, 25 Nov 2018 16:21:38 -0500 Subject: [PATCH 4/7] check root first --- install.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/install.sh b/install.sh index f1cb2ad..162c23f 100755 --- a/install.sh +++ b/install.sh @@ -3,17 +3,15 @@ # Installs Dependencies automatically ################################################################################ -# switch to sudo user - -# source vars -./vars - # check if root if [[ $EUID -ne 0 ]]; then echo -e "This script must be run as root" exit 1 fi +# source vars +./vars + tput setaf 2 echo -e "Installing dependencies" tput setaf 9 From c0ddc4cf1c1bbe169c0d1fb2620b1d1c8afa84ef Mon Sep 17 00:00:00 2001 From: ducoterra Date: Sun, 25 Nov 2018 16:25:40 -0500 Subject: [PATCH 5/7] chmod +x vars --- vars | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 vars diff --git a/vars b/vars old mode 100644 new mode 100755 From 9a3a4bed6f7db489a551b0fc509372e62a8b84a9 Mon Sep 17 00:00:00 2001 From: ducoterra Date: Sun, 25 Nov 2018 16:26:15 -0500 Subject: [PATCH 6/7] fix [[ not found --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 162c23f..7db882b 100755 --- a/install.sh +++ b/install.sh @@ -4,7 +4,7 @@ ################################################################################ # check if root -if [[ $EUID -ne 0 ]]; then +if [ $EUID -ne 0 ]; then echo -e "This script must be run as root" exit 1 fi From 9705f3bc7b254f4ac671a6caca4c65a8b1cd9bc2 Mon Sep 17 00:00:00 2001 From: ducoterra Date: Sun, 25 Nov 2018 16:28:12 -0500 Subject: [PATCH 7/7] adding semi-colons --- install.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/install.sh b/install.sh index 7db882b..6263bf6 100755 --- a/install.sh +++ b/install.sh @@ -4,26 +4,26 @@ ################################################################################ # check if root -if [ $EUID -ne 0 ]; then - echo -e "This script must be run as root" - exit 1 -fi +if [ $EUID -ne 0 ] ; then + echo -e "This script must be run as root"; + exit 1; +fi; # source vars -./vars +./vars; -tput setaf 2 -echo -e "Installing dependencies" -tput setaf 9 +tput setaf 2; +echo -e "Installing dependencies"; +tput setaf 9; # create necessary dirs if [ ! -d $logdir ] ; then - mkdir $logdir -fi + mkdir $logdir; +fi; # install dependencies -packages=(gcc wget nginx ufw make sqlite3 bzip2 openssl libffi-dev libssl-dev libsqlite3-dev zlib1g-dev libbz2-dev libpq-dev) -echo -e "\tRunning apt update" -apt update 1> $aptlogloc 2>> $aptlogloc 3>> $aptlogloc +packages=(gcc wget nginx ufw make sqlite3 bzip2 openssl libffi-dev libssl-dev libsqlite3-dev zlib1g-dev libbz2-dev libpq-dev); +echo -e "\tRunning apt update"; +apt update 1> $aptlogloc 2>> $aptlogloc 3>> $aptlogloc; for package in ${packages[@]}; do echo -e "\tInstalling $package"