fix: missing path of env variable PATH

Change-Id: I6f388ae29ed9af7e836b5fa90996a3f043ee4fc6

Author: WildBeast114514

cyber/setup.bash

@@ -6,25 +6,25 @@ export APOLLO_BAZEL_DIST_DIR="${APOLLO_CACHE_DIR}/distdir"
 export CYBER_PATH="${APOLLO_ROOT_DIR}/cyber"
 
 bazel_bin_path="${APOLLO_ROOT_DIR}/bazel-bin"
-# mainboard_path="${bazel_bin_path}/cyber/mainboard"
-# cyber_tool_path="${bazel_bin_path}/cyber/tools"
-# recorder_path="${cyber_tool_path}/cyber_recorder"
-# launch_path="${cyber_tool_path}/cyber_launch"
-# channel_path="${cyber_tool_path}/cyber_channel"
-# node_path="${cyber_tool_path}/cyber_node"
-# service_path="${cyber_tool_path}/cyber_service"
-# monitor_path="${cyber_tool_path}/cyber_monitor"
-# visualizer_path="${bazel_bin_path}/modules/tools/visualizer"
+mainboard_path="${bazel_bin_path}/cyber/mainboard"
+cyber_tool_path="${bazel_bin_path}/cyber/tools"
+recorder_path="${cyber_tool_path}/cyber_recorder"
+launch_path="${cyber_tool_path}/cyber_launch"
+channel_path="${cyber_tool_path}/cyber_channel"
+node_path="${cyber_tool_path}/cyber_node"
+service_path="${cyber_tool_path}/cyber_service"
+monitor_path="${cyber_tool_path}/cyber_monitor"
+visualizer_path="${bazel_bin_path}/modules/tools/visualizer"
 
 # TODO(all): place all these in one place and pathprepend
-# for entry in "${mainboard_path}" \
-#     "${recorder_path}" "${monitor_path}"  \
-#     "${channel_path}" "${node_path}" \
-#     "${service_path}" \
-#     "${launch_path}" \
-#     "${visualizer_path}" ; do
-#     pathprepend "${entry}"
-# done
+for entry in "${mainboard_path}" \
+    "${recorder_path}" "${monitor_path}"  \
+    "${channel_path}" "${node_path}" \
+    "${service_path}" \
+    "${launch_path}" \
+    "${visualizer_path}" ; do
+    pathprepend "${entry}"
+done
 
 pathprepend ${bazel_bin_path}/cyber/python/internal PYTHONPATH
 pathprepend "${PYTHON_INSTALL_PATH}/lib/python${PYTHON_VERSION}/site-packages" PYTHONPATH

scripts/apollo_base.sh

@@ -33,7 +33,10 @@ function site_restore() {
   [[ -e "${TOP_DIR}/WORKSPACE.source" ]] && rm -f "${TOP_DIR}/WORKSPACE" && cp "${TOP_DIR}/WORKSPACE.source" "${TOP_DIR}/WORKSPACE" 
   echo "" > "${TOP_DIR}/tools/package/rules_cc.patch" 
   [[ -e "${TOP_DIR}/tools/proto/proto.bzl.tpl" ]] && rm -f "${TOP_DIR}/tools/proto/proto.bzl" && cp "${TOP_DIR}/tools/proto/proto.bzl.tpl" "${TOP_DIR}/tools/proto/proto.bzl" 
-  [[ ! -z $(which buildtool) ]] && sudo apt remove -y apollo-neo-buildtool 
+  if which buildtool > /dev/null 2>&1; then
+    sudo apt remove -y apollo-neo-buildtool
+  fi
+  return 0
 }
 
 function env_prepare() {