pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-19 20:41:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed conditional for installing libsodium.

Browse Source 
If it's superseded or already installed, it just won't install it anyway.
This commit is contained in:
Kurt Gilpin 2018-02-24 00:23:30 -06:00 committed by GitHub
parent c87380fa54
commit fc339cc9d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
utils/scripts/linux_installer/install.sh
View File

@ -122,16 +122,12 @@ if [[ "$OS" == "Debian" ]]; then
apt-get $apt_options install libjson-perl apt-get $apt_options install libjson-perl
# If libsodium18 isn't installed (Debian), let's download both that and the dev package and install them. # If libsodium18 isn't installed (Debian), let's download both that and the dev package and install them.
if dpkg-query -s "libsodium18" 1>/dev/null 2>&1; then wget http://ftp.us.debian.org/debian/pool/main/libs/libsodium/libsodium-dev_1.0.11-1~bpo8+1_amd64.deb -O /home/eqemu/libsodium-dev.deb
echo "Sodium library already installed." wget http://ftp.us.debian.org/debian/pool/main/libs/libsodium/libsodium18_1.0.11-1~bpo8+1_amd64.deb -O /home/eqemu/libsodium18.deb
else dpkg -i /home/eqemu/libsodium*.deb
wget http://ftp.us.debian.org/debian/pool/main/libs/libsodium/libsodium-dev_1.0.11-1~bpo8+1_amd64.deb -O /home/eqemu/libsodium-dev.deb # Cleanup after ourselves
wget http://ftp.us.debian.org/debian/pool/main/libs/libsodium/libsodium18_1.0.11-1~bpo8+1_amd64.deb -O /home/eqemu/libsodium18.deb rm -f /home/eqemu/libsodium-dev.deb
dpkg -i /home/eqemu/libsodium*.deb rm -f /home/eqemu/libsodium18.deb
# Cleanup after ourselves
rm -f /home/eqemu/libsodium-dev.deb
rm -f /home/eqemu/libsodium18.deb
fi
#::: Install FTP for remote FTP access #::: Install FTP for remote FTP access
echo "proftpd-basic shared/proftpd/inetd_or_standalone select standalone" | debconf-set-selections echo "proftpd-basic shared/proftpd/inetd_or_standalone select standalone" | debconf-set-selections