diff --git a/image/apps.sh b/image/apps.sh index d9e014ac..961745dc 100755 --- a/image/apps.sh +++ b/image/apps.sh @@ -7,7 +7,7 @@ set -e ################################################################################################################################## -echo -e "\033[0;31m\033[1m$(date) | #1 apt update && apt upgrade\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #1 apt update && apt upgrade\033[0m\033[0m" # install bootstrap tools apt-get update @@ -15,7 +15,7 @@ apt-get update -echo -e "\033[0;31m\033[1m$(date) | #2 Install programs\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #2 Install programs\033[0m\033[0m" apt-get install --no-install-recommends -y \ unzip \ @@ -35,7 +35,7 @@ apt-get install --no-install-recommends -y \ -echo -e "\033[0;31m\033[1m$(date) | #3 Write to /etc/wpa_supplicant/wpa_supplicant.conf\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #3 Write to /etc/wpa_supplicant/wpa_supplicant.conf\033[0m\033[0m" echo " network={ @@ -50,7 +50,7 @@ network={ -echo -e "\033[0;31m\033[1m$(date) | #4 Write STATIC to /etc/dhcpcd.conf\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #4 Write STATIC to /etc/dhcpcd.conf\033[0m\033[0m" echo " interface wlan0 @@ -59,13 +59,13 @@ static ip_address=192.168.11.1/24" >> /etc/dhcpcd.conf -echo -e "\033[0;31m\033[1m$(date) | #5 Write iface to /etc/default/isc-dhcp-server\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #5 Write iface to /etc/default/isc-dhcp-server\033[0m\033[0m" # https://www.shellhacks.com/ru/sed-find-replace-string-in-file/ sed -i 's/INTERFACESv4=\"\"/INTERFACESv4=\"wlan0\"/' /etc/default/isc-dhcp-server -echo -e "\033[0;31m\033[1m$(date) | #6 Write dhcp declaration subnet to /etc/dhcp/dhcpd.conf\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #6 Write dhcp declaration subnet to /etc/dhcp/dhcpd.conf\033[0m\033[0m" echo "subnet 192.168.11.0 netmask 255.255.255.0 { @@ -80,7 +80,7 @@ echo "subnet 192.168.11.0 netmask 255.255.255.0 { -echo -e "\033[0;31m\033[1m$(date) | #7 Write start script for dhcpd to /etc/network/if-up.d/isc-dhcp-server\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #7 Write start script for dhcpd to /etc/network/if-up.d/isc-dhcp-server\033[0m\033[0m" echo "#!/bin/sh if [ \"\$IFACE\" = \"--all\" ]; @@ -91,7 +91,7 @@ fi -echo -e "\033[0;31m\033[1m$(date) | #8 Write magic script for rename SSID to /etc/rc.local\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #8 Write magic script for rename SSID to /etc/rc.local\033[0m\033[0m" RENAME_SSID="sudo sed -i.OLD \"s/CLEVER/CLEVER-\$(head -c 100 /dev/urandom | xxd -ps -c 100 | sed -e 's/[^0-9]//g' | cut -c 1-4)/g\" /etc/wpa_supplicant/wpa_supplicant.conf && sudo sed -i '/sudo sed/d' /etc/rc.local && sudo reboot" @@ -100,5 +100,5 @@ sed -i "19a$RENAME_SSID" /etc/rc.local -echo -e "\033[0;31m\033[1m$(date) | #9 End of install programs\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #9 End of install programs\033[0m\033[0m" diff --git a/image/iface.sh b/image/iface.sh index a493dbcc..deccb0fb 100755 --- a/image/iface.sh +++ b/image/iface.sh @@ -43,14 +43,14 @@ CONFIG=/boot/config.txt # 2. Изменить необходимые настройки # 2.1. Включить sshd -echo -e "\033[0;31m\033[1m$(date) | #11 Turn on sshd\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #11 Turn on sshd\033[0m\033[0m" touch /boot/ssh # 2.2. Включить GPIO # Включено по умолчанию # 2.3. Включить I2C -echo -e "\033[0;31m\033[1m$(date) | #12 Turn on I2C\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #12 Turn on I2C\033[0m\033[0m" set_config_var dtparam=i2c_arm on $CONFIG && if ! [ -e $BLACKLIST ]; then @@ -63,7 +63,7 @@ set_config_var dtparam=i2c_arm on $CONFIG && fi # 2.4. Включить SPI -echo -e "\033[0;31m\033[1m$(date) | #13 Turn on SPI\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #13 Turn on SPI\033[0m\033[0m" set_config_var dtparam=spi on $CONFIG && if ! [ -e $BLACKLIST ]; then @@ -72,7 +72,7 @@ set_config_var dtparam=spi on $CONFIG && sed $BLACKLIST -i -e "s/^\(blacklist[[:space:]]*spi[-_]bcm2708\)/#\1/" # 2.5. Включить raspicam -echo -e "\033[0;31m\033[1m$(date) | #14 Turn on raspicam\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #14 Turn on raspicam\033[0m\033[0m" get_config_var() { lua - "$1" "$2" < /etc/apt/sources.li -echo -e "\033[0;31m\033[1m$(date) | #2 apt update && apt upgrade\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #2 apt update && apt upgrade\033[0m\033[0m" # install bootstrap tools apt-get update @@ -37,7 +37,7 @@ apt-get update -echo -e "\033[0;31m\033[1m$(date) | #3 Install wget, unzip, python-rosdep, python-rosinstall-generator, python-wstool, python-rosinstall, build-essential, cmake\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #3 Install wget, unzip, python-rosdep, python-rosinstall-generator, python-wstool, python-rosinstall, build-essential, cmake\033[0m\033[0m" apt-get install --no-install-recommends -y \ wget \ @@ -52,7 +52,7 @@ apt-get install --no-install-recommends -y \ -echo -e "\033[0;31m\033[1m$(date) | #4 rosdep init && rosdep update\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #4 rosdep init && rosdep update\033[0m\033[0m" # bootstrap rosdep rosdep init && rosdep update @@ -60,7 +60,7 @@ rosdep init && rosdep update -echo -e "\033[0;31m\033[1m$(date) | #5 Prepare ros_comm packages to kinetic-ros_comm-wet.rosinstall\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #5 Prepare ros_comm packages to kinetic-ros_comm-wet.rosinstall\033[0m\033[0m" # create catkin workspace mkdir -p /home/pi/ros_catkin_ws && cd /home/pi/ros_catkin_ws \ @@ -69,7 +69,7 @@ mkdir -p /home/pi/ros_catkin_ws && cd /home/pi/ros_catkin_ws \ -#echo -e "\033[0;31m\033[1m$(date) | #6 Install assimp-3.1.1 to /home/pi/ros_catkin_ws/external_src\033[0m\033[0m" +#echo "\033[0;31m\033[1m$(date) | #6 Install assimp-3.1.1 to /home/pi/ros_catkin_ws/external_src\033[0m\033[0m" # Unavailable Dependencies #mkdir -p /home/pi/ros_catkin_ws/external_src \ @@ -84,7 +84,7 @@ mkdir -p /home/pi/ros_catkin_ws && cd /home/pi/ros_catkin_ws \ -echo -e "\033[0;31m\033[1m$(date) | #7 Prepare other ROS-packages to kinetic-custom_ros.rosinstall\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #7 Prepare other ROS-packages to kinetic-custom_ros.rosinstall\033[0m\033[0m" cd /home/pi/ros_catkin_ws \ && rosinstall_generator \ @@ -96,7 +96,7 @@ cd /home/pi/ros_catkin_ws \ -echo -e "\033[0;31m\033[1m$(date) | #8 Install dependencies apps with rosdep\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #8 Install dependencies apps with rosdep\033[0m\033[0m" # как я понял установка apt-get всяких зависимостей для ros-пакетов # Resolving Dependencies with rosdep @@ -106,7 +106,7 @@ cd /home/pi/ros_catkin_ws \ -echo -e "\033[0;31m\033[1m$(date) | #9 Refactor usb_cam in SRC\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #9 Refactor usb_cam in SRC\033[0m\033[0m" # добавление префикса с помощью двух define # #define PIX_FMT_RGB24 AV_PIX_FMT_RGB24 @@ -116,14 +116,14 @@ sed -i '/#define __STDC_CONSTANT_MACROS/a\#define PIX_FMT_RGB24 AV_PIX_FMT_RGB24 -echo -e "\033[0;31m\033[1m$(date) | #10 Install GeographicLib datasets\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #10 Install GeographicLib datasets\033[0m\033[0m" /home/pi/ros_catkin_ws/src/mavros/mavros/scripts/install_geographiclib_datasets.sh -echo -e "\033[0;31m\033[1m$(date) | #11 Build light packages on 2 threads\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #11 Build light packages on 2 threads\033[0m\033[0m" # Building the catkin Workspace cd /home/pi/ros_catkin_ws && ./src/catkin/bin/catkin_make_isolated --install -DCMAKE_BUILD_TYPE=Release --install-space /opt/ros/kinetic -j2 --pkg 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 diagnostic_msgs diagnostic_updater dynamic_reconfigure eigen_conversions gencpp geneus genlisp genmsg gennodejs genpy geographic_msgs geometry_msgs geometry2 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 xmlrpcpp @@ -131,14 +131,14 @@ cd /home/pi/ros_catkin_ws && ./src/catkin/bin/catkin_make_isolated --install -DC -echo -e "\033[0;31m\033[1m$(date) | #12 Build heavy packages\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #12 Build heavy packages\033[0m\033[0m" # Building the catkin Workspace cd /home/pi/ros_catkin_ws && ./src/catkin/bin/catkin_make_isolated --install -DCMAKE_BUILD_TYPE=Release --install-space /opt/ros/kinetic -j1 --pkg mavros opencv3 cv_bridge cv_camera mavros_extras web_video_server -echo -e "\033[0;31m\033[1m$(date) | #13 Create catkin_ws\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #13 Create catkin_ws\033[0m\033[0m" mkdir -p /home/pi/catkin_ws/src \ && cd /home/pi/catkin_ws \ @@ -149,7 +149,7 @@ mkdir -p /home/pi/catkin_ws/src \ -echo -e "\033[0;31m\033[1m$(date) | #14 Install CLEVER-BUNDLE\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #14 Install CLEVER-BUNDLE\033[0m\033[0m" cd /home/pi/catkin_ws/src \ && git clone https://github.com/CopterExpress/clever.git clever \ @@ -163,7 +163,7 @@ cd /home/pi/catkin_ws/src \ -echo -e "\033[0;31m\033[1m$(date) | #15 Add mjpg-streamer at /home/pi\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #15 Add mjpg-streamer at /home/pi\033[0m\033[0m" # https://github.com/jacksonliam/mjpg-streamer @@ -175,7 +175,7 @@ cd /home/pi \ -echo -e "\033[0;31m\033[1m$(date) | #16 Add ENV vars\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #16 Add ENV vars\033[0m\033[0m" # setup environment echo "LANG=C.UTF-8" >> /home/pi/.bashrc @@ -190,4 +190,4 @@ chown -Rf pi:pi /home/pi -echo -e "\033[0;31m\033[1m$(date) | #17 END of ROS INSTALLATION\033[0m\033[0m" +echo "\033[0;31m\033[1m$(date) | #17 END of ROS INSTALLATION\033[0m\033[0m"