From 71e8d741606a9657b8a815de29a65b9c8f5f55a0 Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Tue, 9 Oct 2018 20:09:50 +0300 Subject: [PATCH] image: Remove spaces --- builder/image-ros.sh | 42 +++++++++++++++++++-------------------- builder/image-software.sh | 4 ++-- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/builder/image-ros.sh b/builder/image-ros.sh index efc0b429..ee9dc9e9 100755 --- a/builder/image-ros.sh +++ b/builder/image-ros.sh @@ -39,9 +39,9 @@ echo_stamp() { # TODO: 'kinetic-rosdep-clever.yaml' should add only if we use our repo? echo_stamp "Init rosdep" \ - && rosdep init \ - && echo "yaml file:///etc/ros/rosdep/kinetic-rosdep-clever.yaml" >> /etc/ros/rosdep/sources.list.d/20-default.list \ - && rosdep update +&& rosdep init \ +&& echo "yaml file:///etc/ros/rosdep/kinetic-rosdep-clever.yaml" >> /etc/ros/rosdep/sources.list.d/20-default.list \ +&& rosdep update resolve_rosdep() { # TEMPLATE: resolve_rosdep @@ -73,28 +73,28 @@ if [ "${INSTALL_ROS_PACK_SOURCES}" = "True" ]; then DISCOVER_ROS_PACK=${DISCOVER_ROS_PACK:='True'} if [ "${DISCOVER_ROS_PACK}" = "False" ]; then echo_stamp "Preparing ros_comm packages to kinetic-ros_comm-wet.rosinstall" \ - && mkdir -p /home/pi/ros_catkin_ws && cd /home/pi/ros_catkin_ws \ - && rosinstall_generator ros_comm --rosdistro kinetic --deps --wet-only --tar > kinetic-ros_comm-wet.rosinstall \ - && wstool init -j${NUMBER_THREADS} src kinetic-ros_comm-wet.rosinstall \ - && echo_stamp "All roscomm sources was installed!" "SUCCESS" \ - || (echo_stamp "Some roscomm sources installation was failed!" "ERROR"; exit 1) + && mkdir -p /home/pi/ros_catkin_ws && cd /home/pi/ros_catkin_ws \ + && rosinstall_generator ros_comm --rosdistro kinetic --deps --wet-only --tar > kinetic-ros_comm-wet.rosinstall \ + && wstool init -j${NUMBER_THREADS} src kinetic-ros_comm-wet.rosinstall \ + && echo_stamp "All roscomm sources was installed!" "SUCCESS" \ + || (echo_stamp "Some roscomm sources installation was failed!" "ERROR"; exit 1) echo_stamp "Preparing other ROS-packages to kinetic-custom_ros.rosinstall" \ - && cd /home/pi/ros_catkin_ws \ - && rosinstall_generator \ - actionlib actionlib_msgs angles async_web_server_cpp bond bond_core bondcpp bondpy camera_calibration_parsers camera_info_manager catkin class_loader cmake_modules cpp_common cv_bridge cv_camera diagnostic_msgs diagnostic_updater dynamic_reconfigure eigen_conversions gencpp geneus genlisp genmsg gennodejs genpy geographic_msgs geometry_msgs geometry2 image_transport compressed_image_transport libmavconn mavlink mavros_msgs message_filters message_generation message_runtime mk nav_msgs nodelet orocos_kdl pluginlib python_orocos_kdl ros ros_comm rosapi rosauth rosbag rosbag_migration_rule rosbag_storage rosbash rosboost_cfg rosbridge_library rosbridge_server rosbridge_suite rosbuild rosclean rosconsole rosconsole_bridge roscpp roscpp_serialization roscpp_traits roscreate rosgraph rosgraph_msgs roslang roslaunch roslib roslint roslisp roslz4 rosmake rosmaster rosmsg rosnode rosout rospack rosparam rospy rospy_tutorials rosserial rosserial_client rosserial_msgs rosserial_python rosservice rostest rostime rostopic rosunit roswtf sensor_msgs smclib std_msgs std_srvs stereo_msgs tf tf2 tf2_bullet tf2_eigen tf2_geometry_msgs tf2_kdl tf2_msgs tf2_py tf2_ros tf2_sensor_msgs tf2_tools topic_tools trajectory_msgs urdf urdf_parser_plugin usb_cam uuid_msgs visualization_msgs web_video_server xmlrpcpp mavros opencv3 mavros_extras interactive_markers tf2_web_republisher interactive_marker_proxy \ - --rosdistro kinetic --deps --wet-only --tar > kinetic-custom_ros.rosinstall \ - && wstool merge -j${NUMBER_THREADS} -t src kinetic-custom_ros.rosinstall \ - && wstool update -j${NUMBER_THREADS} -t src \ - && echo_stamp "All custom sources was installed!" "SUCCESS" \ - || (echo_stamp "Some custom sources installation was failed!" "ERROR"; exit 1) + && cd /home/pi/ros_catkin_ws \ + && rosinstall_generator \ + actionlib actionlib_msgs angles async_web_server_cpp bond bond_core bondcpp bondpy camera_calibration_parsers camera_info_manager catkin class_loader cmake_modules cpp_common cv_bridge cv_camera diagnostic_msgs diagnostic_updater dynamic_reconfigure eigen_conversions gencpp geneus genlisp genmsg gennodejs genpy geographic_msgs geometry_msgs geometry2 image_transport compressed_image_transport libmavconn mavlink mavros_msgs message_filters message_generation message_runtime mk nav_msgs nodelet orocos_kdl pluginlib python_orocos_kdl ros ros_comm rosapi rosauth rosbag rosbag_migration_rule rosbag_storage rosbash rosboost_cfg rosbridge_library rosbridge_server rosbridge_suite rosbuild rosclean rosconsole rosconsole_bridge roscpp roscpp_serialization roscpp_traits roscreate rosgraph rosgraph_msgs roslang roslaunch roslib roslint roslisp roslz4 rosmake rosmaster rosmsg rosnode rosout rospack rosparam rospy rospy_tutorials rosserial rosserial_client rosserial_msgs rosserial_python rosservice rostest rostime rostopic rosunit roswtf sensor_msgs smclib std_msgs std_srvs stereo_msgs tf tf2 tf2_bullet tf2_eigen tf2_geometry_msgs tf2_kdl tf2_msgs tf2_py tf2_ros tf2_sensor_msgs tf2_tools topic_tools trajectory_msgs urdf urdf_parser_plugin usb_cam uuid_msgs visualization_msgs web_video_server xmlrpcpp mavros opencv3 mavros_extras interactive_markers tf2_web_republisher interactive_marker_proxy \ + --rosdistro kinetic --deps --wet-only --tar > kinetic-custom_ros.rosinstall \ + && wstool merge -j${NUMBER_THREADS} -t src kinetic-custom_ros.rosinstall \ + && wstool update -j${NUMBER_THREADS} -t src \ + && echo_stamp "All custom sources was installed!" "SUCCESS" \ + || (echo_stamp "Some custom sources installation was failed!" "ERROR"; exit 1) else echo_stamp "Creating ros_catkin_ws & getting all sources using wstool" \ - && mkdir -p /home/pi/ros_catkin_ws && cd /home/pi/ros_catkin_ws \ - && wstool init -j${NUMBER_THREADS} src kinetic-ros-clever.rosinstall \ - > /dev/null \ - && echo_stamp "All CLEVER sources was installed!" "SUCCESS" \ - || (echo_stamp "Some CLEVER sources installation was failed!" "ERROR"; exit 1) + && mkdir -p /home/pi/ros_catkin_ws && cd /home/pi/ros_catkin_ws \ + && wstool init -j${NUMBER_THREADS} src kinetic-ros-clever.rosinstall \ + > /dev/null \ + && echo_stamp "All CLEVER sources was installed!" "SUCCESS" \ + || (echo_stamp "Some CLEVER sources installation was failed!" "ERROR"; exit 1) fi resolve_rosdep '/home/pi/ros_catkin_ws' diff --git a/builder/image-software.sh b/builder/image-software.sh index 6e3765fd..bc6fd303 100755 --- a/builder/image-software.sh +++ b/builder/image-software.sh @@ -35,8 +35,8 @@ echo_stamp "Install apt keys & repos" # TODO: This STDOUT consist 'OK' curl http://repo.coex.space/aptly_repo_signing.key 2> /dev/null | apt-key add - apt-get update \ - && apt-get install --no-install-recommends -y -qq dirmngr=2.1.18-8~deb9u2 > /dev/null \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116 +&& apt-get install --no-install-recommends -y -qq dirmngr=2.1.18-8~deb9u2 > /dev/null \ +&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116 echo "deb http://packages.ros.org/ros/ubuntu stretch main" > /etc/apt/sources.list.d/ros-latest.list echo "deb http://repo.coex.space/rpi-ros-kinetic stretch main" > /etc/apt/sources.list.d/rpi-ros-kinetic.list