mirror of
https://github.com/raspiblitz/raspiblitz.git
synced 2025-09-27 20:16:22 +02:00
Merge branch 'master' into v1.6
This commit is contained in:
@@ -159,7 +159,7 @@ if [ "${baseImage}" = "raspbian" ] || [ "${baseImage}" = "dietpi" ] ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# remove some (big) packages that are not needed
|
# 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 clean
|
||||||
sudo apt -y autoremove
|
sudo apt -y autoremove
|
||||||
|
|
||||||
@@ -888,13 +888,11 @@ if [ "${lcdInstalled}" == "true" ]; then
|
|||||||
echo "*** LCD DRIVER ***"
|
echo "*** LCD DRIVER ***"
|
||||||
echo "--> Downloading LCD Driver from Github"
|
echo "--> Downloading LCD Driver from Github"
|
||||||
cd /home/admin/
|
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 chmod -R 755 LCD-show
|
||||||
sudo -u admin chown -R admin:admin LCD-show
|
sudo -u admin chown -R admin:admin LCD-show
|
||||||
cd LCD-show/
|
cd LCD-show/
|
||||||
# set comit hard to old version - that seemed to run better
|
sudo -u admin git reset --hard 53dd0bf
|
||||||
#
|
|
||||||
sudo -u admin git reset --hard ce52014
|
|
||||||
|
|
||||||
# install xinput calibrator package
|
# install xinput calibrator package
|
||||||
echo "--> install xinput calibrator package"
|
echo "--> install xinput calibrator package"
|
||||||
|
@@ -85,7 +85,7 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# get name of active interface (eth0 or wlan0)
|
# 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
|
# get network traffic
|
||||||
# ifconfig does not show eth0 on Armbian or in a VM - get first traffic info
|
# ifconfig does not show eth0 on Armbian or in a VM - get first traffic info
|
||||||
|
Reference in New Issue
Block a user