Skip to content

Commit c4e9b6e

Browse files
Update install_candle_controller.sh
1 parent 87d2187 commit c4e9b6e

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

install_candle_controller.sh

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,8 @@ if [ -d "$CANDLE_BASE/webthings/gateway2" ]; then
585585
cp -rL static build/static
586586
find build -name '*.ts' -delete
587587

588+
echo "does gateway-addon/lib still exist?"
589+
ls /home/pi/webthings/gateway/node_modules/gateway-addon/lib
588590

589591
echo ""
590592
echo "Compiling typescript. this will take a while..."
@@ -618,24 +620,27 @@ if [ -d "$CANDLE_BASE/webthings/gateway2" ]; then
618620
NODE_OPTIONS="--max-old-space-size=2048" npx --yes webpack
619621
fi
620622

623+
echo "does gateway-addon/lib exist?"
624+
ls /home/pi/webthings/gateway/node_modules/gateway-addon/lib/index.js
621625

622626
if [ -f "$CANDLE_BASE/webthings/gateway2/build/app.js" ] \
623627
&& [ -f "$CANDLE_BASE/webthings/gateway2/build/static/index.html" ] \
624628
&& [ -d "$CANDLE_BASE/webthings/gateway2/node_modules" ] \
629+
&& [ -f "$CANDLE_BASE/webthings/gateway2/node_modules/gateway-addon/lib/index.js" ] \
625630
&& [ -d "$CANDLE_BASE/webthings/gateway2/build/static/bundle" ];
626631
then
627632

628-
# remove now unnecessary node modules
629-
npm_config_yes=true npm prune --omit=dev -y --force-yes
633+
# remove now unnecessary node modules
634+
npm_config_yes=true npm prune --omit=dev -y --force-yes
630635

631-
echo "creating .post_upgrade_complete file"
632-
touch .post_upgrade_complete
633-
echo "$(date +%s)" > update_date.txt
634-
#echo "Controller installation seems ok"
635-
echo "Controller installation seems ok, at $(pwd)"
636-
echo "Controller installation seems ok, at $(pwd)" | sudo tee -a /dev/kmsg
636+
echo "creating .post_upgrade_complete file"
637+
touch .post_upgrade_complete
638+
echo "$(date +%s)" > update_date.txt
639+
#echo "Controller installation seems ok"
640+
echo "Controller installation seems ok, at $(pwd)"
641+
echo "Controller installation seems ok, at $(pwd)" | sudo tee -a /dev/kmsg
637642

638-
echo
643+
echo
639644
echo "New controller was created at $(pwd)"
640645
echo
641646
# Move the freshly created gateway into position
@@ -695,7 +700,7 @@ echo "Candle: Linking gateway addon" | sudo tee -a $BOOT_DIR/candle_log.txt
695700
if [ -d "$CANDLE_BASE/webthings/gateway/node_modules/gateway-addon" ];
696701
then
697702
cd "$CANDLE_BASE/webthings/gateway/node_modules/gateway-addon"
698-
npm link
703+
#npm link
699704
cd "$CANDLE_BASE"
700705
else
701706
echo "ERROR, $CANDLE_BASE/webthings/gateway/node_modules/gateway-addon was missing"
@@ -704,7 +709,8 @@ else
704709
fi
705710

706711

707-
712+
echo "does gateway-addon/lib exist even later?"
713+
ls /home/pi/webthings/gateway/node_modules/gateway-addon/lib/index.js
708714

709715
# TODO: maybe do another sanity check and restore a backup if need be?
710716

0 commit comments

Comments
 (0)