Browse Source

Check if the image was created

Bob Mottram 9 years ago
parent
commit
3239da7be5
2 changed files with 19 additions and 5 deletions
  1. 17
    3
      src/freedombone-image
  2. 2
    2
      src/freedombone-image-customise

+ 17
- 3
src/freedombone-image View File

138
     NAMESERVER1="$NAMESERVER1" \
138
     NAMESERVER1="$NAMESERVER1" \
139
     NAMESERVER2="$NAMESERVER2"
139
     NAMESERVER2="$NAMESERVER2"
140
 
140
 
141
-mv build/*.bz2 $CURR_DIR
142
-mv build/*.img $CURR_DIR
143
-mv build/*.sig $CURR_DIR
141
+shopt -s nullglob
142
+imgfiles=(build/freedombone*.img)
143
+if [ ${#imgfiles[@]} -eq 0 ]; then
144
+	echo 'Image was not created'
145
+	rm -rf $BUILD_DIR
146
+	exit 1
147
+fi
148
+
149
+mv build/freedombone*.bz2 $CURR_DIR
150
+mv build/freedombone*.img $CURR_DIR
151
+mv build/freedombone*.sig $CURR_DIR
144
 rm -rf $BUILD_DIR
152
 rm -rf $BUILD_DIR
145
 
153
 
154
+clear
155
+echo '
156
+Image was created
157
+'
158
+ls -lh freedombone*.img freedombone*.sig freedombone*.bz2
159
+
146
 exit 0
160
 exit 0

+ 2
- 2
src/freedombone-image-customise View File

18
 set -e
18
 set -e
19
 set -x
19
 set -x
20
 
20
 
21
-MY_USERNAME=$USER
21
+MY_USERNAME='debian'
22
 MY_PASSWORD='freedombone'
22
 MY_PASSWORD='freedombone'
23
 
23
 
24
 # IP address of the router (gateway)
24
 # IP address of the router (gateway)
191
 echo "
191
 echo "
192
 To complete the installation run the following:
192
 To complete the installation run the following:
193
 
193
 
194
-    su
194
+    sudo su
195
     freedombone menuconfig
195
     freedombone menuconfig
196
 
196
 
197
 " > $rootdir/etc/init.d/motd
197
 " > $rootdir/etc/init.d/motd