From e7a7a87e48729e680c5db5a44d065f265a9178e0 Mon Sep 17 00:00:00 2001
From: Artem Smirnov <urpylka@gmail.com>
Date: Mon, 20 Aug 2018 18:05:28 +0300
Subject: [PATCH] image_builder: change code order in manual.sh

---
 image_builder/manual.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/image_builder/manual.sh b/image_builder/manual.sh
index d01151a0..58d339cc 100755
--- a/image_builder/manual.sh
+++ b/image_builder/manual.sh
@@ -1,5 +1,7 @@
 #! /bin/bash
 
+set -e
+
 DEBIAN_FRONTEND='noninteractive'
 LANG='C.UTF-8'
 LC_ALL='C.UTF-8'
@@ -9,8 +11,6 @@ echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2
 
 apt install unzip wget
 
-set -e
-
 BUILD_DIR=$(pwd)
 IMAGE_NAME="clever_qemu.img"
 
@@ -20,6 +20,9 @@ RPI_DONWLOAD_URL="https://downloads.raspberrypi.org/raspbian_lite/images/raspbia
 ./image_config.sh resize_fs ${BUILD_DIR}/${IMAGE_NAME} "7G"
 ./image_config.sh copy_to_chroot ${BUILD_DIR}/${IMAGE_NAME} "qemu-arm-resin" "/usr/bin/qemu-arm-static"
 
+./image_config.sh copy_to_chroot ${BUILD_DIR}/${IMAGE_NAME} "scripts/init_rpi.sh" "/root/"
+./image_config.sh copy_to_chroot ${BUILD_DIR}/${IMAGE_NAME} "scripts/hardware_setup.sh" "/root/"
+
 ./image_config.sh execute ${BUILD_DIR}/${IMAGE_NAME} "scripts/init_image.sh" "qemu_build_20082018" "raspbian_nov_2017"
 ./image_config.sh execute ${BUILD_DIR}/${IMAGE_NAME} "scripts/software_install.sh"
 ./image_config.sh execute ${BUILD_DIR}/${IMAGE_NAME} "scripts/network_setup.sh"
@@ -27,11 +30,8 @@ RPI_DONWLOAD_URL="https://downloads.raspberrypi.org/raspbian_lite/images/raspbia
 #./image_config.sh copy_to_chroot ${BUILD_DIR}/${IMAGE_NAME} "kinetic-ros-coex.rosinstall" "/home/pi/ros_catkin_ws/"
 #./image_config.sh execute ${BUILD_DIR}/${IMAGE_NAME} scripts/ros_install.sh https://github.com/CopterExpress/clever.git master True
 
-./image_config.sh copy_to_chroot ${BUILD_DIR}/${IMAGE_NAME} "scripts/init_rpi.sh" "/root/"
-./image_config.sh copy_to_chroot ${BUILD_DIR}/${IMAGE_NAME} "scripts/hardware_setup.sh" "/root/"
+#./image_config.sh copy_to_chroot ${BUILD_DIR}/${IMAGE_NAME} "scripts" "/"
+#./image_config.sh execute ${BUILD_DIR}/${IMAGE_NAME}
 
 ./autosizer.sh ${BUILD_DIR}/${IMAGE_NAME}
 ./image_config.sh execute ${BUILD_DIR}/${IMAGE_NAME} "scripts/change_boot_part.sh"
-
-#./image_config.sh copy_to_chroot ${BUILD_DIR}/${IMAGE_NAME} "scripts" "/"
-#./image_config.sh execute ${BUILD_DIR}/${IMAGE_NAME}
\ No newline at end of file