Index: scripts/run.sh =================================================================== diff -u -r627b97843f87f5ca8fbd731c6c4a6d9fae4352ce -r465a935949a85d3d1bebd11979737ff38ef96122 --- scripts/run.sh (.../run.sh) (revision 627b97843f87f5ca8fbd731c6c4a6d9fae4352ce) +++ scripts/run.sh (.../run.sh) (revision 465a935949a85d3d1bebd11979737ff38ef96122) @@ -27,6 +27,7 @@ SDCARD_DEV=/dev/mmcblk1p1 SDCARD_MNT=/media/sd-card +SDCARD_TYP=ext4 USB_DEV=/dev/sda1 USB_MNT=/media/usb CLOUDSYNC_FOLDER=cloudsync # both for log and application @@ -42,35 +43,42 @@ POSTMSG_BLUETOOTH="Bluetooth passed" POSTMSG_SHASUM="App shasum passed" + # cleanup the POST log file echo "Start: $(currDate)" > $POSTLOG echo "" > $POSTERR echo "" > $POSTOUT + #create folders for sd-card and usb if not exist mkdir -p $SDCARD_MNT mkdir -p $USB_MNT + +# ---------------------------------------- STOP denali in case running (sys not rebooted) +killall denali + + # ---------------------------------------- UPDATE #mounting usb mount $USB_DEV $USB_MNT -if [ $? -eq 0 ]; then +USBTEST="$(mount | grep "$USB_MNT")" +if ! [ -z "$USBTEST" ]; then echo ":: USB drive found and mounted on $USB_MNT" -fi -#A simple none secure update -if [ -e $USB_MNT/denali ]; then - mv $HOME/denali $HOME/denali.$(currDate) - cp $USB_MNT/denali $HOME/denali - # check if update where successful - if [ $? -eq 0 ]; then - sync;sync;sync; - echo ":: Denali application has been updated with the one on the USB drive" - mv $USB_MNT/denali $USB_MNT/denali.updated - sync;sync;sync; + #A simple none secure update + if [ -e $USB_MNT/denali ]; then + mv $HOME/denali $HOME/denali.$(currDate) + cp $USB_MNT/denali $HOME/denali + # check if update where successful + if [ $? -eq 0 ]; then + sync;sync;sync; + echo ":: Denali application has been updated with the one on the USB drive" + mv $USB_MNT/denali $USB_MNT/denali.updated + sync;sync;sync; + fi fi fi - # ---------------------------------------- SETUP & POST #Here only passed is logged and if nothing added to the post.log means it failed. @@ -88,14 +96,12 @@ #mounting sdcard -------------------------- SD-CARD mount $SDCARD_DEV $SDCARD_MNT -if [ $? -eq 0 ]; then - SDTEST="$(mount | grep "$SDCARD_DEV on $SDCARD_MNT.*(rw,")" - if ! [ -z "$SDTEST" ]; then - SDINFO="$(df -h | grep -i $SDCARD_MNT)" - echo $POSTMSG_SDCARD >> $POSTLOG - echo $SDTEST >> $POSTLOG - echo $SDINFO >> $POSTLOG - fi +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 fi @@ -155,19 +161,21 @@ # ---------------------------------------- CloudSync -# moving/ backing up the previous treatment logs so the new buff starts with fresh sequence -echo "Backing up CloudSync I/O buff" -CLOUDSYNC_PATH="$SDCARD_MNT"/"$CLOUDSYNC_FOLDER" -CLOUDSYNC_BACKUP="$CLOUDSYNC_PATH"_backup/$(currDate)/ -mkdir -p $CLOUDSYNC_BACKUP -mv $CLOUDSYNC_PATH/* $CLOUDSYNC_BACKUP -rm $HOME/$CLOUDSYNC_FOLDER/data/* -echo "Starting CloudSync" >> $POSTLOG -cd $HOME/$CLOUDSYNC_FOLDER/ -python3 ./cs.py start & -sleep 2 -echo "$(python3 ./cs.py status)" >> $POSTLOG -cd +if [ -d $CLOUDSYNC_FOLDER ]; then + # moving/ backing up the previous treatment logs so the new buff starts with fresh sequence + echo "Backing up CloudSync I/O buff" + CLOUDSYNC_PATH="$SDCARD_MNT"/"$CLOUDSYNC_FOLDER" + CLOUDSYNC_BACKUP="$CLOUDSYNC_PATH"_backup/$(currDate)/ + mkdir -p $CLOUDSYNC_BACKUP + mv $CLOUDSYNC_PATH/* $CLOUDSYNC_BACKUP + rm $HOME/$CLOUDSYNC_FOLDER/data/* + echo "Starting CloudSync" >> $POSTLOG + cd $HOME/$CLOUDSYNC_FOLDER/ + python3 ./cs.py start & + sleep 2 + echo "$(python3 ./cs.py status)" >> $POSTLOG + cd +fi # ---------------------------------------- Denali