From 5590e64e0a2f74b2f64c8e8e0f76eb9bdfe055a4 Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Tue, 21 Aug 2018 21:45:59 +0300 Subject: [PATCH] image_builder: little syntax fix --- image_builder/autosizer.sh | 4 ++-- image_builder/image_config.sh | 2 +- image_builder/scripts/software_install.sh | 12 +++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/image_builder/autosizer.sh b/image_builder/autosizer.sh index 19d4041c..7f786cbe 100755 --- a/image_builder/autosizer.sh +++ b/image_builder/autosizer.sh @@ -35,10 +35,10 @@ if [[ -z $1 ]]; then echo "================================================================================" echo_bold "Automatic Image file resizer" echo_bold "Description: This script shrink your image to 10MiB free space" - echo -e "if you didn't set FREE_SPACE in MiB (see usage below)." + echo_bold "if you didn't set FREE_SPACE in MiB (see usage below)." echo_bold "Authors: Artem Smirnov @urpylka, SirLagz" echo - echo_bold "Usage: ./autosizer.sh PATH_TO_IMAGE FREE_SPACE" + echo_bold "Usage: ./autosizer.sh IMAGE_PATH FREE_SPACE" echo echo_bold "Requirements: parted, losetup, e2fsck, resize2fs, bc, truncate" echo "================================================================================" diff --git a/image_builder/image_config.sh b/image_builder/image_config.sh index 83f0a255..050dab3c 100755 --- a/image_builder/image_config.sh +++ b/image_builder/image_config.sh @@ -92,7 +92,7 @@ resize_fs() { } execute() { - # TEMPLATE: execute <$EXECUTE_FILE> <...> + # TEMPLATE: execute <...> echo_stamp "Mount loop-image: $1" local DEV_IMAGE=$(losetup -Pf $1 --show) diff --git a/image_builder/scripts/software_install.sh b/image_builder/scripts/software_install.sh index d311df68..2d7972ac 100755 --- a/image_builder/scripts/software_install.sh +++ b/image_builder/scripts/software_install.sh @@ -54,16 +54,14 @@ echo_stamp "#2 Adding mjpg-streamer at /home/pi" # https://github.com/jacksonliam/mjpg-streamer git clone https://github.com/jacksonliam/mjpg-streamer.git /home/pi/mjpg-streamer \ - && cd /home/pi/mjpg-streamer/mjpg-streamer-experimental \ - && make \ - && make install \ - && chown -Rf pi:pi /home/pi/mjpg-streamer +&& cd /home/pi/mjpg-streamer/mjpg-streamer-experimental \ +&& make \ +&& make install \ +&& chown -Rf pi:pi /home/pi/mjpg-streamer echo_stamp "Add .vimrc" - -# vim settings echo "set mouse-=a syntax on " > /home/pi/.vimrc -echo_stamp "End of network installation" +echo_stamp "#3 End of network installation"