CopterExpress/clover
1
0
Fork 0
mirror of https://github.com/CopterExpress/clover.git synced 2026-05-27 05:29:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

image_builder: fix bug w scope of variable

Browse Source
This commit is contained in:
Artem Smirnov
2018-09-24 20:18:48 +03:00
parent fa817d9f80
commit 595e67a928
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builder_docker/image-chroot.sh
View File

@@ -117,10 +117,10 @@ umount_system() {
# Repeat 5 times
for i in {1..5}; do
umount -fR $1 \
&& (echo_stamp "OK" "SUCCESS"; umount_ok=true; break) \
&& umount_ok=true && break \
|| (echo_stamp "Failed #$i (try 5 times)" "ERROR"; sleep 2)
done
[[ "$umount_ok" == true ]] \
[[ "$umount_ok" == true ]] && echo_stamp "OK" "SUCCESS" \
|| (echo_stamp "Umount loop-image was failed" "ERROR"; exit 1)
losetup -d $2
}

2
builder_scripts/ros_install.sh
View File

@@ -50,7 +50,7 @@ resolve_rosdep() {
for i in {1..5}; do
# Resolving Dependencies with rosdep
rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} -r --os=${OS_DISTRO}:${OS_VERSION} \
&& (install_ok=true; break) || (echo_stamp "rosdep iteration #$i failed!" "ERROR"; sleep 2)
&& install_ok=true && break || (echo_stamp "rosdep iteration #$i failed!" "ERROR"; sleep 2)
done
set -e
# Stage fail if this condition is not true