|
@@ -412,10 +412,6 @@ install_dependencies() {
|
|
dependencies="git wireguard-tools dnsutils jq docker.io docker-compose grep gawk"
|
|
dependencies="git wireguard-tools dnsutils jq docker.io docker-compose grep gawk"
|
|
update_cmd='pacman -Sy'
|
|
update_cmd='pacman -Sy'
|
|
install_cmd='pacman -S --noconfirm'
|
|
install_cmd='pacman -S --noconfirm'
|
|
- elif [ "${OS}" = "FreeBSD" ]; then
|
|
|
|
- dependencies="git wireguard wget jq docker.io docker-compose grep gawk"
|
|
|
|
- update_cmd='pkg update'
|
|
|
|
- install_cmd='pkg install -y'
|
|
|
|
else
|
|
else
|
|
install_cmd=''
|
|
install_cmd=''
|
|
fi
|
|
fi
|
|
@@ -441,25 +437,18 @@ install_dependencies() {
|
|
${update_cmd}
|
|
${update_cmd}
|
|
|
|
|
|
while [ -n "$1" ]; do
|
|
while [ -n "$1" ]; do
|
|
- if [ "${OS}" = "FreeBSD" ]; then
|
|
|
|
- is_installed=$(pkg check -d $1 | grep "Checking" | grep "done")
|
|
|
|
- if [ "$is_installed" != "" ]; then
|
|
|
|
- echo " " $1 is installed
|
|
|
|
- else
|
|
|
|
- echo " " $1 is not installed. Attempting install.
|
|
|
|
- ${install_cmd} $1
|
|
|
|
- sleep 5
|
|
|
|
- is_installed=$(pkg check -d $1 | grep "Checking" | grep "done")
|
|
|
|
- if [ "$is_installed" != "" ]; then
|
|
|
|
- echo " " $1 is installed
|
|
|
|
- elif [ -x "$(command -v $1)" ]; then
|
|
|
|
- echo " " $1 is installed
|
|
|
|
- else
|
|
|
|
- echo " " FAILED TO INSTALL $1
|
|
|
|
- echo " " This may break functionality.
|
|
|
|
- fi
|
|
|
|
- fi
|
|
|
|
|
|
+
|
|
|
|
+ if [ "${OS}" = "OpenWRT" ] || [ "${OS}" = "TurrisOS" ]; then
|
|
|
|
+ is_installed=$(opkg list-installed $1 | grep $1)
|
|
else
|
|
else
|
|
|
|
+ is_installed=$(dpkg-query -W --showformat='${Status}\n' $1 | grep "install ok installed")
|
|
|
|
+ fi
|
|
|
|
+ if [ "${is_installed}" != "" ]; then
|
|
|
|
+ echo " " $1 is installed
|
|
|
|
+ else
|
|
|
|
+ echo " " $1 is not installed. Attempting install.
|
|
|
|
+ ${install_cmd} $1
|
|
|
|
+ sleep 5
|
|
if [ "${OS}" = "OpenWRT" ] || [ "${OS}" = "TurrisOS" ]; then
|
|
if [ "${OS}" = "OpenWRT" ] || [ "${OS}" = "TurrisOS" ]; then
|
|
is_installed=$(opkg list-installed $1 | grep $1)
|
|
is_installed=$(opkg list-installed $1 | grep $1)
|
|
else
|
|
else
|
|
@@ -467,26 +456,14 @@ install_dependencies() {
|
|
fi
|
|
fi
|
|
if [ "${is_installed}" != "" ]; then
|
|
if [ "${is_installed}" != "" ]; then
|
|
echo " " $1 is installed
|
|
echo " " $1 is installed
|
|
|
|
+ elif [ -x "$(command -v $1)" ]; then
|
|
|
|
+ echo " " $1 is installed
|
|
else
|
|
else
|
|
- echo " " $1 is not installed. Attempting install.
|
|
|
|
- ${install_cmd} $1
|
|
|
|
- sleep 5
|
|
|
|
- if [ "${OS}" = "OpenWRT" ] || [ "${OS}" = "TurrisOS" ]; then
|
|
|
|
- is_installed=$(opkg list-installed $1 | grep $1)
|
|
|
|
- else
|
|
|
|
- is_installed=$(dpkg-query -W --showformat='${Status}\n' $1 | grep "install ok installed")
|
|
|
|
- fi
|
|
|
|
- if [ "${is_installed}" != "" ]; then
|
|
|
|
- echo " " $1 is installed
|
|
|
|
- elif [ -x "$(command -v $1)" ]; then
|
|
|
|
- echo " " $1 is installed
|
|
|
|
- else
|
|
|
|
- echo " " FAILED TO INSTALL $1
|
|
|
|
- echo " " This may break functionality.
|
|
|
|
- fi
|
|
|
|
|
|
+ echo " " FAILED TO INSTALL $1
|
|
|
|
+ echo " " This may break functionality.
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
- shift
|
|
|
|
|
|
+ shift
|
|
done
|
|
done
|
|
|
|
|
|
echo "-----------------------------------------------------"
|
|
echo "-----------------------------------------------------"
|