diff --git a/install.sh b/install.sh index ca43360..df55b17 100755 --- a/install.sh +++ b/install.sh @@ -3,27 +3,27 @@ # Installs Dependencies automatically ################################################################################ -# source vars -source vars - # 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 +# source vars +./vars + tput setaf 2 echo -e "Installing dependencies" tput setaf 9 # create necessary dirs if [ ! -d $logdir ] ; then mkdir $logdir -fi +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 +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" @@ -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" diff --git a/vars b/vars old mode 100644 new mode 100755