mirrors/raspiblitz
1
0
Fork 0
mirror of https://github.com/rootzoll/raspiblitz.git synced 2025-02-22 06:21:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

prevent checkout hook (#3560)

Browse source 
* modify dev notes

* display recover during lean-build

* prevent hooks

* prevent hook
This commit is contained in:
/rootzoll 2022-12-21 17:34:38 +01:00 • committed by GitHub
parent 4a2a33c081
commit 8ce103f889
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
alternative.platforms/display.alternatives.sh
View file

@ -55,7 +55,7 @@ if [ "${CHOICE}" = "GPIO" ]; then
sudo apt-mark hold raspberrypi-bootloader
sudo ./LCD35-show
else
sudo rm -rf /etc/X11/xorg.conf.d/40-libinput.conf
sudo rm -rf /etc/X11/xorg.conf.d/40-libinput.conf 2>/dev/null
sudo mkdir /etc/X11/xorg.conf.d
sudo cp ./usr/tft35a-overlay.dtb /boot/overlays/
sudo cp ./usr/tft35a-overlay.dtb /boot/overlays/tft35a.dtbo
@ -79,7 +79,7 @@ elif [ "${CHOICE}" = "HDMI" ]; then
sudo chmod -R 755 LCD-show
cd LCD-show/
#sudo ./MPI3508-show
sudo rm -rf /etc/X11/xorg.conf.d/40-libinput.conf
sudo rm -rf /etc/X11/xorg.conf.d/40-libinput.conf 2>/dev/null
if [ "${baseimage}" != "dietpi" ]; then
sudo cp -rf ./boot/config-35-480X320.txt /boot/config.txt

11
home.admin/config.scripts/blitz.display.sh Executable file → Normal file
View file

@ -138,9 +138,9 @@ if [ "${command}" == "rotate" ]; then
# change rotation config
echo "# Turn ON: LCD ROTATE"
sed -i "s/^dtoverlay=.*/dtoverlay=waveshare35a:rotate=90/g" /boot/config.txt
rm /etc/X11/xorg.conf.d/40-libinput.conf >/dev/null
rm /etc/X11/xorg.conf.d/40-libinput.conf 2>/dev/null
/home/admin/config.scripts/blitz.conf.sh set lcdrotate 1
/home/admin/config.scripts/blitz.conf.sh set lcdrotate 1 2>/dev/null
echo "# OK - a restart is needed: sudo shutdown -r now"
# TURN ROTATE OFF
@ -165,7 +165,7 @@ EOF
fi
# update raspiblitz conf
/home/admin/config.scripts/blitz.conf.sh set lcdrotate 0
/home/admin/config.scripts/blitz.conf.sh set lcdrotate 0 2>/dev/null
echo "OK - a restart is needed: sudo shutdown -r now"
else
@ -202,7 +202,7 @@ function prepareinstall() {
if [ ${repoCloned} -lt 1 ]; then
echo "# clone/download https://github.com/tux1c/wavesharelcd-64bit-rpi.git"
cd /home/admin/
sudo -u admin git clone https://github.com/tux1c/wavesharelcd-64bit-rpi.git
sudo -u admin git clone --no-checkout https://github.com/tux1c/wavesharelcd-64bit-rpi.git
sudo -u admin chmod -R 755 wavesharelcd-64bit-rpi
sudo -u admin chown -R admin:admin wavesharelcd-64bit-rpi
else
@ -247,6 +247,7 @@ function install_lcd() {
# Downloading LCD Driver from Github
prepareinstall
cd /home/admin/wavesharelcd-64bit-rpi
sudo -u admin git checkout master
sudo -u admin git reset --hard 5a206a7 || exit 1
sudo -u admin /home/admin/config.scripts/blitz.git-verify.sh \
'GitHub' 'https://github.com/web-flow.gpg' '4AEE18F83AFDEB23' || exit 1
@ -480,7 +481,7 @@ if [ "${command}" == "set-display" ]; then
fi
# mark new display class in config (if exist)
/home/admin/config.scripts/blitz.conf.sh set displayClass ${paramDisplayClass}
/home/admin/config.scripts/blitz.conf.sh set displayClass ${paramDisplayClass} 2>/dev/null
sed -i "s/^displayClass=.*/displayClass=${paramDisplayClass}/g" /home/admin/raspiblitz.info
exit 0