mirrors/raspiblitz
1
0
Fork 0
mirror of https://github.com/rootzoll/raspiblitz.git synced 2025-02-25 15:10:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1234 from openoms/thub-patch

Browse source 
Thub patch
This commit is contained in:
openoms 2020-06-03 11:03:48 +01:00 • committed by GitHub
commit b84c05ecaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
home.admin/00settingsMenuServices.sh
View file

@ -638,12 +638,22 @@ fi
choice="off"; check=$(echo "${CHOICES}" | grep -c "t") choice="off"; check=$(echo "${CHOICES}" | grep -c "t")
if [ ${check} -eq 1 ]; then choice="on"; fi if [ ${check} -eq 1 ]; then choice="on"; fi
if [ "${thunderhub}" != "${choice}" ]; then if [ "${thunderhub}" != "${choice}" ]; then
echo " ThunderHub setting changed .." echo "ThunderHub Setting changed .."
anychange=1 anychange=1
sudo -u admin /home/admin/config.scripts/bonus.thunderhub.sh ${choice} /home/admin/config.scripts/bonus.thunderhub.sh ${choice}
source /mnt/hdd/raspiblitz.conf errorOnInstall=$?
if [ "${thunderhub}" = "on" ]; then if [ "${choice}" = "on" ]; then
sudo -u admin /home/admin/config.scripts/bonus.thunderhub.sh menu if [ ${errorOnInstall} -eq 0 ]; then
sudo systemctl start thunderhub
echo "waiting 10 secs .."
sleep 10
/home/admin/config.scripts/bonus.thunderhub.sh menu
else
l1="!!! FAIL on ThunderHub install !!!"
l2="Try manual install on terminal after reboot with:"
l3="/home/admin/config.scripts/bonus.thunderhub.sh on"
dialog --title 'FAIL' --msgbox "${l1}\n${l2}\n${l3}" 7 65
fi
fi fi
else else
echo "ThunderHub setting unchanged." echo "ThunderHub setting unchanged."

8
home.admin/config.scripts/bonus.thunderhub.sh
View file

@ -75,6 +75,8 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
# download and install # download and install
sudo -u thunderhub git clone https://github.com/apotdevin/thunderhub.git /home/thunderhub/thunderhub sudo -u thunderhub git clone https://github.com/apotdevin/thunderhub.git /home/thunderhub/thunderhub
cd /home/thunderhub/thunderhub cd /home/thunderhub/thunderhub
# https://github.com/apotdevin/thunderhub/releases
sudo -u thunderhub git reset --hard v0.6.13
echo "Running npm install and run build..." echo "Running npm install and run build..."
sudo -u thunderhub npm install sudo -u thunderhub npm install
sudo -u thunderhub npm run build sudo -u thunderhub npm run build
@ -139,7 +141,7 @@ EOF
sudo rm -f /home/thunderhub/thubConfig.yaml sudo rm -f /home/thunderhub/thubConfig.yaml
sudo mv /home/admin/thubConfig.yaml /home/thunderhub/thubConfig.yaml sudo mv /home/admin/thubConfig.yaml /home/thunderhub/thubConfig.yaml
sudo chown thunderhub:thunderhub /home/thunderhub/thubConfig.yaml sudo chown thunderhub:thunderhub /home/thunderhub/thubConfig.yaml
sudo chown 600 /home/thunderhub/thubConfig.yaml | exit 1 sudo chmod 600 /home/thunderhub/thubConfig.yaml | exit 1
################## ##################
# SYSTEMD SERVICE # SYSTEMD SERVICE
@ -191,9 +193,11 @@ fi
if [ "$1" = "0" ] || [ "$1" = "off" ]; then if [ "$1" = "0" ] || [ "$1" = "off" ]; then
echo "*** REMOVING THUNDERHUB ***" echo "*** REMOVING THUNDERHUB ***"
sudo userdel -rf thunderhub # remove systemd service
sudo systemctl disable thunderhub sudo systemctl disable thunderhub
sudo rm -f /etc/systemd/system/thunderhub.service sudo rm -f /etc/systemd/system/thunderhub.service
# delete user and home directory
sudo userdel -rf thunderhub
echo "OK ThunderHub removed." echo "OK ThunderHub removed."
# setting value in raspi blitz config # setting value in raspi blitz config