Merge branch 'master' into v1.6

This commit is contained in:
rootzoll 2020-09-08 19:59:09 +02:00
commit f573322fd3
3 changed files with 196 additions and 200 deletions

386
README.md

File diff suppressed because it is too large Load Diff

View File

@ -159,7 +159,7 @@ if [ "${baseImage}" = "raspbian" ] || [ "${baseImage}" = "dietpi" ] ; then
fi
# remove some (big) packages that are not needed
sudo apt remove -y --purge libreoffice* oracle-java* chromium-browser nuscratch scratch sonic-pi minecraft-pi plymouth python2
sudo apt remove -y --purge libreoffice* oracle-java* chromium-browser nuscratch scratch sonic-pi minecraft-pi plymouth python2 vlc
sudo apt clean
sudo apt -y autoremove
@ -888,13 +888,11 @@ if [ "${lcdInstalled}" == "true" ]; then
echo "*** LCD DRIVER ***"
echo "--> Downloading LCD Driver from Github"
cd /home/admin/
sudo -u admin git clone https://github.com/goodtft/LCD-show.git
sudo -u admin git clone https://github.com/MrYacha/LCD-show.git
sudo -u admin chmod -R 755 LCD-show
sudo -u admin chown -R admin:admin LCD-show
cd LCD-show/
# set comit hard to old version - that seemed to run better
#
sudo -u admin git reset --hard ce52014
sudo -u admin git reset --hard 53dd0bf
# install xinput calibrator package
echo "--> install xinput calibrator package"

View File

@ -85,7 +85,7 @@ else
fi
# get name of active interface (eth0 or wlan0)
network_active_if=$(ip addr | grep -v "lo:" | grep 'state UP' | tr -d " " | cut -d ":" -f2 | head -n 1)
network_active_if=$(ip route get 255.255.255.255 | awk -- '{print $4}' | head -n 1)
# get network traffic
# ifconfig does not show eth0 on Armbian or in a VM - get first traffic info