From 3f7dec4d79aa2cbbe11d51501b19f1126ac581ee Mon Sep 17 00:00:00 2001 From: urpylka Date: Sat, 10 Mar 2018 18:02:05 +0400 Subject: [PATCH] Fix: change bash to sh Signed-off-by: urpylka --- image/apps.sh | 2 +- image/iface.sh | 2 +- image/image-config.sh | 3 +-- image/ros.sh | 6 +++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/image/apps.sh b/image/apps.sh index 6a6139e6..9eb97ac8 100755 --- a/image/apps.sh +++ b/image/apps.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ################################################################################################################################## # Установка необходимых программ diff --git a/image/iface.sh b/image/iface.sh index f4b1fb3b..50b7e7df 100755 --- a/image/iface.sh +++ b/image/iface.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ################################################################################################################################## # Настройка интерфейсов diff --git a/image/image-config.sh b/image/image-config.sh index 345d292b..18a16959 100755 --- a/image/image-config.sh +++ b/image/image-config.sh @@ -1,4 +1,3 @@ -#!/bin/bash #!/bin/sh set -e @@ -243,7 +242,7 @@ mount_system2() { cp -L /etc/resolv.conf $2/etc/resolv.conf echo -e "\033[0;31m\033[1m$(date) | Enter chroot\033[0m\033[0m" - chroot $2 /bin/bash -c "$5" + chroot $2 /bin/sh -c "$5" } umount_system() { diff --git a/image/ros.sh b/image/ros.sh index 2848fdd3..543b0e66 100755 --- a/image/ros.sh +++ b/image/ros.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ################################################################################################################################## # ROS for user pi @@ -140,7 +140,7 @@ echo -e "\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 \ - && source /opt/ros/kinetic/setup.bash \ + && . /opt/ros/kinetic/setup.sh \ && catkin init \ && wstool init /home/pi/catkin_ws/src @@ -154,7 +154,7 @@ cd /home/pi/catkin_ws/src \ && pip install wheel \ && pip install -r /home/pi/catkin_ws/src/clever/clever/requirements.txt \ && cd /home/pi/catkin_ws \ - && source /opt/ros/kinetic/setup.bash \ + && . /opt/ros/kinetic/setup.sh \ && catkin_make -j1 \ && systemctl enable /home/pi/catkin_ws/src/clever/deploy/roscore.service \ && systemctl enable /home/pi/catkin_ws/src/clever/deploy/clever.service