Index: scripts/globals.sh
===================================================================
diff -u -r726d47bb0fc706bedbc202e4aa4ce8f1ebc1b6e6 -rff5794ee387f1e37a01cea349c0085dae5281d5d
--- scripts/globals.sh	(.../globals.sh)	(revision 726d47bb0fc706bedbc202e4aa4ce8f1ebc1b6e6)
+++ scripts/globals.sh	(.../globals.sh)	(revision ff5794ee387f1e37a01cea349c0085dae5281d5d)
@@ -342,12 +342,17 @@
 }
 
 function setupCANBus() {
-  if [ $(isDemoMode) -eq $TRUE ]; then
-    D_CANBUS=$V_CANBUS
-    setupVCAN
-  else
+  if [ "$1" == "setup" ];then
     D_CANBUS=$P_CANBUS # it is the default but kept to be consistent.
     setupPCAN
+  else
+    if [ $(isDemoMode) -eq $TRUE ]; then
+      D_CANBUS=$V_CANBUS
+      setupVCAN
+    else
+      D_CANBUS=$P_CANBUS # it is the default but kept to be consistent.
+      setupPCAN
+    fi
   fi
   checkCANBus
 }
@@ -602,7 +607,7 @@
   if [ $(isDemoMode) -eq $TRUE ]; then
     # ----------------------------------------- Demo Mode
     post_log_dash                             " Demo Mode "
-    local DRYDEMO_PATH=$DEMO_HOME/$DEMO_FOLDER
+    local DRYDEMO_PATH=$DEMO_HOME/$SRC_PATH_DRYDEMO
     cd $DRYDEMO_PATH
     ./run.py > $DRYDEMO_PATH.log & # create the log file at same level and name of the folder.
     post_log "Dry-Demo Started"
@@ -628,7 +633,7 @@
   cleanupPOSTLogs
   checkDemoMode
   queryOSVersion
-  setupCANBus
+  setupCANBus       $1
   setupResolved
   killApplication
   setupEthernet