Index: scripts/globals.sh =================================================================== diff -u -rb1c2f458dc6c49c923938f51a2a1a8f4ca130f2f -r726d47bb0fc706bedbc202e4aa4ce8f1ebc1b6e6 --- scripts/globals.sh (.../globals.sh) (revision b1c2f458dc6c49c923938f51a2a1a8f4ca130f2f) +++ scripts/globals.sh (.../globals.sh) (revision 726d47bb0fc706bedbc202e4aa4ce8f1ebc1b6e6) @@ -37,7 +37,6 @@ USB_MNT=/media/usb CLOUDSYNC_FOLDER=cloudsync # both for log and application -DRYDEMO_FOLDER=drydemo LOG_LOCATION=$HOME/Desktop LOG_OUT_FILE="" @@ -131,17 +130,17 @@ D_CANBUS=$P_CANBUS function checkDemoMode() { - if [ -d "$DEMO_HOME/$DEMO_FOLDER" ]; then + if [ -d "$DEMO_HOME/$SRC_PATH_DRYDEMO" ]; then DEMO_MODE=1 fi } # *** this function should be used without brackets in the if to be effective. function isDemoMode() { if [ $DEMO_MODE -eq 1 ]; then - return TRUE # exit/return 0 for if in bash is true + echo $TRUE else - return FALSE # exit/return not 0 for if in bash is false + echo $FALSE fi } @@ -343,7 +342,7 @@ } function setupCANBus() { - if [ $(isDemoMode) -eq TRUE ]; then + if [ $(isDemoMode) -eq $TRUE ]; then D_CANBUS=$V_CANBUS setupVCAN else @@ -357,7 +356,7 @@ #mounting sdcard -------------------------- SD-CARD post_log_dash " SD-CARD " mkdir -p $SDCARD_MNT - mount $SDCARD_PRT $SDCARD_MNT + mount -o noexec,nodev,nosuid $SDCARD_PRT $SDCARD_MNT SDCTEST="$(mount | grep "$SDCARD_PRT on $SDCARD_MNT type $SDCARD_TYP_NAME (rw,")" if ! [ -z "$SDCTEST" ]; then SDINFO="$(df -h | grep -i $SDCARD_MNT)" @@ -589,7 +588,7 @@ DENALI_VERSION="$($DENALI_HOME/$DENALI_BIN -v)" if [ -n "$DENALI_VERSION" ]; then post_log_pass "$DENALI_VERSION" # log UI Software version - if [ $(isDemoMode) -eq TRUE ]; then + if [ $(isDemoMode) -eq $TRUE ]; then APPLICATION_PARAMS="$APPLICATION_PARAMS"" -q -D -A $D_CANBUS" fi sudo -u $DENALI_USER $DENALI_HOME/$DENALI_BIN $APPLICATION_PARAMS 1>> /tmp/denali.out 2>> /tmp/denali.out & @@ -600,7 +599,7 @@ function startDemoMode_local() { # *** eliminated brackets are intentional. *** - if [ $(isDemoMode) -eq TRUE ]; then + if [ $(isDemoMode) -eq $TRUE ]; then # ----------------------------------------- Demo Mode post_log_dash " Demo Mode " local DRYDEMO_PATH=$DEMO_HOME/$DEMO_FOLDER