diff --git a/DnsServerApp.NETCore/install-raspi.sh b/DnsServerApp.NETCore/install-raspi.sh index 3d4a519b..2f98500c 100644 --- a/DnsServerApp.NETCore/install-raspi.sh +++ b/DnsServerApp.NETCore/install-raspi.sh @@ -1,9 +1,9 @@ #!/bin/sh aspnetcoreDir="/opt/dotnet" -aspnetcoreTestDir="/opt/dotnet/shared/Microsoft.NETCore.App/2.2.5/" -aspnetcoreTar="/opt/dotnet/aspnetcore-runtime-2.2.5-linux-arm.tar.gz" -aspnetcoreUrl="https://download.visualstudio.microsoft.com/download/pr/cd6635b9-f6f8-4c2d-beda-2e381fe39586/740973b83c199bf863a51c83a2432151/aspnetcore-runtime-2.2.5-linux-arm.tar.gz" +aspnetcoreTestDir="/opt/dotnet/shared/Microsoft.NETCore.App/3.1.0/" +aspnetcoreTar="/opt/dotnet/aspnetcore-runtime-3.1.0-linux-arm.tar.gz" +aspnetcoreUrl="https://download.visualstudio.microsoft.com/download/pr/8c839c0e-a5ae-4254-8d8b-c012528fe601/c147e26bad68f97eacc287a71e01331d/aspnetcore-runtime-3.1.0-linux-arm.tar.gz" dnsDir="/etc/dns" dnsTar="/etc/dns/DnsServerPortable.tar.gz" diff --git a/DnsServerApp.NETCore/install-ubuntu.sh b/DnsServerApp.NETCore/install-ubuntu.sh index 4f5eaa44..f084e838 100644 --- a/DnsServerApp.NETCore/install-ubuntu.sh +++ b/DnsServerApp.NETCore/install-ubuntu.sh @@ -13,31 +13,25 @@ echo "===============================" echo "Technitium DNS Server Installer" echo "===============================" echo "" +echo "Installing .NET Core Runtime..." -if [ -f "/usr/bin/dotnet" ] +if wget -q "https://packages.microsoft.com/config/ubuntu/$(lsb_release -r -s)/packages-microsoft-prod.deb" -O "$dnsDir/packages-microsoft-prod.deb" then - echo ".NET Core Runtime was found installed." + dpkg -i "$dnsDir/packages-microsoft-prod.deb">> $installLog 2>&1 + + add-apt-repository universe >> $installLog 2>&1 + + until apt-get -y update >> $installLog 2>&1 && apt-get -y install libunwind8 icu-devtools apt-transport-https aspnetcore-runtime-3.1 >> $installLog 2>&1 + do + echo "Trying again.." + sleep 2 + done + + echo ".NET Core Runtime was installed succesfully." else - echo "Installing .NET Core Runtime..." - - if wget -q "https://packages.microsoft.com/config/ubuntu/$(lsb_release -r -s)/packages-microsoft-prod.deb" -O "$dnsDir/packages-microsoft-prod.deb" - then - dpkg -i "$dnsDir/packages-microsoft-prod.deb">> $installLog 2>&1 - - add-apt-repository universe >> $installLog 2>&1 - - until apt-get -y update >> $installLog 2>&1 && apt-get -y install libunwind8 icu-devtools apt-transport-https aspnetcore-runtime-2.2 >> $installLog 2>&1 - do - echo "Trying again.." - sleep 2 - done - - echo ".NET Core Runtime was installed succesfully." - else - echo "" - echo "Failed to install .NET Core Runtime. Please try again." - exit 1 - fi + echo "" + echo "Failed to install .NET Core Runtime. Please try again." + exit 1 fi echo ""