mirror of
https://github.com/EQEmu/Server.git
synced 2026-03-29 08:23:34 +00:00
Merge branch 'master' of https://github.com/EQEmu/Server
This commit is contained in:
commit
c469571f62
@ -121,17 +121,13 @@ if [[ "$OS" == "Debian" ]]; then
|
|||||||
apt-get $apt_options install libsodium18
|
apt-get $apt_options install libsodium18
|
||||||
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.
|
# Install libsodium
|
||||||
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
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user