From 3239da7be50cff1a2255db4fc3819d799b1f1d31 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 21 Nov 2015 10:29:10 +0000 Subject: [PATCH] Check if the image was created --- src/freedombone-image | 20 +++++++++++++++++--- src/freedombone-image-customise | 4 ++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/freedombone-image b/src/freedombone-image index de962465..4874d054 100755 --- a/src/freedombone-image +++ b/src/freedombone-image @@ -138,9 +138,23 @@ make $IMAGE_TYPE \ NAMESERVER1="$NAMESERVER1" \ NAMESERVER2="$NAMESERVER2" -mv build/*.bz2 $CURR_DIR -mv build/*.img $CURR_DIR -mv build/*.sig $CURR_DIR +shopt -s nullglob +imgfiles=(build/freedombone*.img) +if [ ${#imgfiles[@]} -eq 0 ]; then + echo 'Image was not created' + rm -rf $BUILD_DIR + exit 1 +fi + +mv build/freedombone*.bz2 $CURR_DIR +mv build/freedombone*.img $CURR_DIR +mv build/freedombone*.sig $CURR_DIR rm -rf $BUILD_DIR +clear +echo ' +Image was created +' +ls -lh freedombone*.img freedombone*.sig freedombone*.bz2 + exit 0 diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index ff379471..797b80e2 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -18,7 +18,7 @@ set -e set -x -MY_USERNAME=$USER +MY_USERNAME='debian' MY_PASSWORD='freedombone' # IP address of the router (gateway) @@ -191,7 +191,7 @@ sed -i "/nameserver $NAMESERVER1/a\nameserver $NAMESERVER2" $rootdir/etc/resolv. echo " To complete the installation run the following: - su + sudo su freedombone menuconfig " > $rootdir/etc/init.d/motd