Skip to content

Commit 4efe51a

Browse files
Add files via upload
1 parent 9844f2e commit 4efe51a

File tree

2 files changed

+30
-12
lines changed

2 files changed

+30
-12
lines changed

create_latest_candle_dev.sh

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,16 +1670,6 @@ find /home/pi/.webthings/tmp \
16701670

16711671
cd /home/pi
16721672

1673-
if [ -e /home/pi/webthings/gateway/static/images/floorplan.svg ];
1674-
then
1675-
cp /home/pi/webthings/gateway/static/images/floorplan.svg /home/pi/.webthings/floorplan.svg
1676-
chown pi:pi /home/pi/.webthings/floorplan.svg
1677-
else
1678-
echo ""
1679-
echo "WARNING: missing floorplan"
1680-
echo ""
1681-
fi
1682-
16831673
# SYMLINKS
16841674

16851675
# move hosts file to user partition
@@ -1788,6 +1778,7 @@ chmod +x /home/pi/candle/late.sh
17881778
chmod +x /etc/rc.local
17891779
chmod +x /home/pi/candle/debug.sh
17901780
chmod +x /home/pi/candle/files_check.sh
1781+
chmod +x /home/pi/candle/prepare_for_disk_image.sh
17911782
chmod +x /home/pi/candle/unsnap.sh
17921783

17931784
# CHOWN THE NEW FILES
@@ -1829,6 +1820,7 @@ echo
18291820
systemctl enable candle_first_run.service
18301821
#systemctl enable candle_start_swap.service
18311822
systemctl enable candle_early.service
1823+
systemctl enable candle_late.service
18321824
systemctl enable candle_late.service
18331825
systemctl enable candle_splashscreen.service
18341826
systemctl enable candle_splashscreen180.service
@@ -2440,6 +2432,15 @@ then
24402432
fi
24412433

24422434

2435+
if [ -e /home/pi/webthings/gateway/static/images/floorplan.svg ];
2436+
then
2437+
cp /home/pi/webthings/gateway/static/images/floorplan.svg /home/pi/.webthings/floorplan.svg
2438+
chown pi:pi /home/pi/.webthings/floorplan.svg
2439+
else
2440+
echo ""
2441+
echo "WARNING: missing floorplan"
2442+
echo ""
2443+
fi
24432444

24442445

24452446

@@ -2451,6 +2452,10 @@ if [ -f /home/pi/create_latest_candle.sh ]; then
24512452
rm /home/pi/create_latest_candle.sh
24522453
fi
24532454

2455+
if [ -f /home/pi/ro-root.sh ]; then
2456+
rm /home/pi/ro-root.sh
2457+
fi
2458+
24542459

24552460
# Some final insurance
24562461
chown pi:pi /home/pi/*
@@ -2463,6 +2468,11 @@ chown -R pi:pi /home/pi/candle/*
24632468
#
24642469

24652470

2471+
if [ -f /boot/cmdline-candle.txt ]; then
2472+
echo "copying default Candle cmdline.txt into place"
2473+
rm /boot/cmdline.txt
2474+
cp /boot/cmdline-candle.txt /boot/cmdline.txt
2475+
fi
24662476

24672477

24682478
# cp /home/pi/.webthings/etc/webthings_settings_backup.js /home/pi/.webthings/etc/webthings_settings.js
@@ -2477,7 +2487,7 @@ if [ ! -f /home/pi/candle/creation_date.txt ]; then
24772487
fi
24782488

24792489
# remember when the update script was last run
2480-
echo "$(date +%s)" > /home/pi/candle/update_date
2490+
echo "$(date +%s)" > /home/pi/candle/update_date.txt
24812491

24822492
# Disable old bootup actions service
24832493
systemctl disable candle_bootup_actions.service

install_candle_controller.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,7 @@ then
559559
chown -R pi:pi candle-theme
560560
rm ./*.tgz
561561

562+
562563
rm -rf package
563564
rm -rf tutorial
564565
wget https://github.com/createcandle/tutorial/releases/download/1.0.7/tutorial-1.0.7.tgz
@@ -569,6 +570,7 @@ then
569570
chown -R pi:pi tutorial
570571
rm ./*.tgz
571572

573+
572574
rm -rf package
573575
rm -rf bluetoothpairing
574576
wget https://github.com/createcandle/bluetoothpairing/releases/download/0.5.8/bluetoothpairing-0.5.8.tgz
@@ -579,6 +581,7 @@ then
579581
chown -R pi:pi bluetoothpairing
580582
rm ./*.tgz
581583

584+
582585
rm -rf package
583586
rm -rf photo-frame
584587
wget https://github.com/flatsiedatsie/photo-frame/releases/download/1.4.17/photo-frame-1.4.17.tgz
@@ -589,6 +592,7 @@ then
589592
chown -R pi:pi photo-frame
590593
rm ./*.tgz
591594

595+
592596
rm -rf package
593597
rm -rf followers
594598
wget https://github.com/flatsiedatsie/followers-addon/releases/download/0.6.8/followers-0.6.8.tgz
@@ -599,6 +603,7 @@ then
599603
chown -R pi:pi followers
600604
rm ./*.tgz
601605

606+
602607
rm -rf package
603608
rm -rf internet-radio
604609
wget https://github.com/flatsiedatsie/internet-radio/releases/download/2.1.32/internet-radio-2.1.32.tgz
@@ -609,6 +614,7 @@ then
609614
chown -R pi:pi internet-radio
610615
rm ./*.tgz
611616

617+
612618
rm -rf package
613619
rm -rf zigbee2mqtt-adapter
614620
wget https://github.com/kabbi/zigbee2mqtt-adapter/releases/download/1.1.3/zigbee2mqtt-adapter-1.1.3.tgz
@@ -620,6 +626,7 @@ then
620626
chown -R pi:pi zigbee2mqtt-adapter
621627
rm ./*.tgz
622628

629+
623630
rm -rf package
624631
rm -rf privacy-manager
625632
wget https://github.com/createcandle/privacy-manager/releases/download/0.2.8/privacy-manager-0.2.8.tgz
@@ -630,6 +637,7 @@ then
630637
chown -R pi:pi privacy-manager
631638
rm ./*.tgz
632639

640+
633641
rm -rf package
634642
rm -rf webinterface
635643
wget https://github.com/createcandle/webinterface/releases/download/0.2.3/webinterface-0.2.3.tgz
@@ -640,7 +648,7 @@ then
640648
chown -R pi:pi webinterface
641649
rm ./*.tgz
642650

643-
rm candleappstore-0.4.18-linux-arm-v3.9.tgz
651+
644652
rm -rf package
645653
rm -rf candleappstore
646654
wget https://github.com/createcandle/candleappstore/releases/download/0.4.18/candleappstore-0.4.18-linux-arm-v3.9.tgz

0 commit comments

Comments
 (0)