diff --git a/easyinstall.sh b/easyinstall.sh index 58940e19..563a8801 100755 --- a/easyinstall.sh +++ b/easyinstall.sh @@ -744,95 +744,17 @@ function setupWirelessNetworking() { # Downloads, compiles, and installs Netatalk (AppleShare server) function installNetatalk() { - NETATALK_VERSION="2-220101" + NETATALK_VERSION="2-220702" AFP_SHARE_PATH="$HOME/afpshare" - SYSCONFDIR="/etc" - - sudo systemctl stop atalkd afpd || true - - if [ -f /etc/init.d/netatalk ]; then - echo "" - echo "WARNING: An old version of Netatalk was detected. It is recommended to back up you configuration files and shared files before proceeding. Press CTRL-C to exit, or any other key to proceed." - read - sudo /etc/init.d/netatalk stop || true - fi - - if [ -f /var/log/afpd.log ]; then - echo "Removing /var/log/afpd.log created by an old version of Netatalk..." - sudo rm /var/log/afpd.log - fi - - if [[ `grep -c netatalk /etc/rc.local` -eq 1 ]]; then - sudo sed -i "/netatalk/d" /etc/rc.local - echo "Removed Netatalk from /etc/rc.local -- use systemctl to control Netatalk from now on." - fi - - if [ -d "$HOME/Netatalk-2.x-netatalk-$NETATALK_VERSION" ]; then - echo "Deleting existing copy of $HOME/Netatalk-2.x-netatalk-$NETATALK_VERSION." - sudo rm -rf "$HOME/Netatalk-2.x-netatalk-$NETATALK_VERSION" - fi + AFP_SHARE_NAME="Pi File Server" echo "Downloading netatalk-$NETATALK_VERSION to $HOME" cd $HOME || exit 1 wget -O "netatalk-$NETATALK_VERSION.tar.gz" "https://github.com/rdmark/Netatalk-2.x/archive/refs/tags/netatalk-$NETATALK_VERSION.tar.gz" > ./config/AppleVolumes.default.tmpl - - echo "- -transall -uamlist uams_guest.so,uams_clrtxt.so,uams_dhx2.so -nosavepassword -noicon" >> ./config/afpd.conf.tmpl - echo "cupsautoadd:op=root:" >> ./config/papd.conf - - ( sudo apt-get update && sudo apt-get install libssl-dev libdb-dev libcups2-dev cups libavahi-client-dev autotools-dev automake libtool libgcrypt20-dev --assume-yes )