Index: scripts/run.sh =================================================================== diff -u -r465a935949a85d3d1bebd11979737ff38ef96122 -re5577fbd781ded0678882680d5d31f08f56c9c68 --- scripts/run.sh (.../run.sh) (revision 465a935949a85d3d1bebd11979737ff38ef96122) +++ scripts/run.sh (.../run.sh) (revision e5577fbd781ded0678882680d5d31f08f56c9c68) @@ -35,15 +35,18 @@ POSTLOG=$HOME/post.log POSTERR=$HOME/post.err POSTOUT=$HOME/post.out -POSTMSG_CANBUS="CANBus passed" -POSTMSG_SDCARD="SD-CARD passed" -POSTMSG_TOUCH="Touch passed" -POSTMSG_RTC="RTC passed" -POSTMSG_WIFI="WiFi passed" -POSTMSG_BLUETOOTH="Bluetooth passed" -POSTMSG_SHASUM="App shasum passed" +POSTMSG_POSTFIX_PASSED=" passed" +POSTMSG_POSTFIX_FAILED=" failed" +POSTMSG_CANBUS="CANBus" +POSTMSG_SDCARD="SD-CARD" +POSTMSG_TOUCH="Touch" +POSTMSG_RTC="RTC" +POSTMSG_WIFI="WiFi" +POSTMSG_BLUETOOTH="Bluetooth" +POSTMSG_SHASUM="App shasum" +POSTMSG_CLOUDSYNC="CloudSync" +POSTMSG_CLOUDSYNC_RUNNING="CloudSync app IS running" - # cleanup the POST log file echo "Start: $(currDate)" > $POSTLOG echo "" > $POSTERR @@ -90,7 +93,9 @@ ifconfig can0 txqueuelen 4000 candump can0 -T1 # check if candump can successfully use the port. will terminate in 1ms if [ $? -eq 0 ]; then - echo $POSTMSG_CANBUS >> $POSTLOG + echo $POSTMSG_CANBUS$POSTMSG_POSTFIX_PASSED >> $POSTLOG +else + echo $POSTMSG_CANBUS$POSTMSG_POSTFIX_FAILED >> $POSTLOG fi @@ -99,9 +104,11 @@ SDCTEST="$(mount | grep "$SDCARD_DEV on $SDCARD_MNT type $SDCARD_TYP (rw,")" if ! [ -z "$SDCTEST" ]; then SDINFO="$(df -h | grep -i $SDCARD_MNT)" - echo $POSTMSG_SDCARD >> $POSTLOG - echo $SDCTEST >> $POSTLOG - echo $SDINFO >> $POSTLOG + echo $POSTMSG_SDCARD$POSTMSG_POSTFIX_PASSED >> $POSTLOG + echo $SDCTEST >> $POSTLOG + echo $SDINFO >> $POSTLOG +else + echo $POSTMSG_SDCARD$POSTMSG_POSTFIX_FAILED >> $POSTLOG fi @@ -111,7 +118,9 @@ #if there is other issues can even be empty. TSTEST="$(dmesg | grep Touch)" if [ $? -eq 0 ]; then - echo $POSTMSG_TOUCH >> $POSTLOG + echo $POSTMSG_TOUCH$POSTMSG_POSTFIX_PASSED >> $POSTLOG +else + echo $POSTMSG_TOUCH$POSTMSG_POSTFIX_FAILED >> $POSTLOG fi @@ -125,7 +134,9 @@ sleep 1 RTC2=$(cat /sys/class/rtc/rtc0/since_epoch) if [ $(($RTC2 - $RTC1)) -eq 1 ]; then - echo $POSTMSG_RTC >> $POSTLOG + echo $POSTMSG_RTC$POSTMSG_POSTFIX_PASSED >> $POSTLOG + else + echo $POSTMSG_RTC$POSTMSG_POSTFIX_FAILED >> $POSTLOG fi fi @@ -140,14 +151,18 @@ sleep 5 hciconfig hci0 up if [ $? -eq 0 ]; then - echo $POSTMSG_BLUETOOTH >> $POSTLOG + echo $POSTMSG_BLUETOOTH$POSTMSG_POSTFIX_PASSED >> $POSTLOG +else + echo $POSTMSG_BLUETOOTH$POSTMSG_POSTFIX_FAILED >> $POSTLOG fi # ---------------------------------------- WiFi killall wpa_supplicant 1>> $POSTOUT 2>> $POSTERR if [[ ! -z $(dmesg | grep "wlan: driver loaded") ]]; then - echo $POSTMSG_WIFI >> $POSTLOG + echo $POSTMSG_WIFI$POSTMSG_POSTFIX_PASSED >> $POSTLOG +else + echo $POSTMSG_WIFI$POSTMSG_POSTFIX_FAILED >> $POSTLOG fi @@ -156,7 +171,9 @@ SHA_ACT=$(tail -c 83 $HOME/denali | cut -c19-82) SHA_EXP=$(head -c -83 $HOME/denali | sha256sum -b --tag | cut -c14-77) if [ "$SHA_ACT" == "$SHA_EXP" ]; then - echo $POSTMSG_SHASUM >> $POSTLOG + echo $POSTMSG_SHASUM$POSTMSG_POSTFIX_PASSED >> $POSTLOG +else + echo $POSTMSG_SHASUM$POSTMSG_POSTFIX_FAILED >> $POSTLOG fi @@ -173,8 +190,15 @@ cd $HOME/$CLOUDSYNC_FOLDER/ python3 ./cs.py start & sleep 2 - echo "$(python3 ./cs.py status)" >> $POSTLOG + CLOUDSYNC_STATUS="$(python3 ./cs.py status)" + if $CLOUDSYNC_STATUS == $POSTMSG_CLOUDSYNC_RUNNING; then + echo $POSTMSG_CLOUDSYNC$POSTMSG_POSTFIX_PASSED >> $POSTLOG + else + echo $POSTMSG_CLOUDSYNC$POSTMSG_POSTFIX_FAILED >> $POSTLOG + fi cd +else + echo $POSTMSG_CLOUDSYNC$POSTMSG_POSTFIX_FAILED >> $POSTLOG fi