From f6ce7e9ae547118292832811bf58832c207467ec Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Thu, 11 Jun 2020 09:41:50 -0700 Subject: [PATCH] Few small freebsd fixes (#319) * Use python 3.7 which is the default. * Fix typo (missing space before closing ]): 00:04:22.942 + [ -f /usr/ports/UPDATING] 00:04:22.942 [: missing ] * GC unneded "cd resource". php.sh is included into resources/ngnix.sh, which does cd resources as the first step by itself. --- freebsd/install.sh | 2 +- freebsd/resources/fail2ban.sh | 2 +- freebsd/resources/php.sh | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/freebsd/install.sh b/freebsd/install.sh index 3c80b0a..b4bfba5 100755 --- a/freebsd/install.sh +++ b/freebsd/install.sh @@ -14,7 +14,7 @@ pkg upgrade --yes #Update the ports if [ .$portsnap_enabled = .'true' ]; then - if [ -f /usr/ports/UPDATING]; then + if [ -f /usr/ports/UPDATING ]; then portsnap fetch && portsnap update echo "/usr/ports updated" else diff --git a/freebsd/resources/fail2ban.sh b/freebsd/resources/fail2ban.sh index 41f96be..abfd80a 100755 --- a/freebsd/resources/fail2ban.sh +++ b/freebsd/resources/fail2ban.sh @@ -11,7 +11,7 @@ cd "$(dirname "$0")" verbose "Installing Fail2ban" #add the dependencies -pkg install --yes py27-fail2ban +pkg install --yes py37-fail2ban #enable fail2ban service echo 'fail2ban_enable="YES"' >> /etc/rc.conf diff --git a/freebsd/resources/php.sh b/freebsd/resources/php.sh index 01c2c45..a9f520b 100755 --- a/freebsd/resources/php.sh +++ b/freebsd/resources/php.sh @@ -1,8 +1,5 @@ #!/bin/sh -#move to script directory so all relative paths work -cd "$(dirname "$0")" - #includes . ./config.sh . ./colors.sh