Kaynağa Gözat

use install_tox

Bob Mottram 8 yıl önce
ebeveyn
işleme
b4e2ad3fa1
No account linked to committer's email

+ 2
- 2
src/freedombone-image Dosyayı Görüntüle

358
 
358
 
359
 cd $TEMPBUILD_DIR
359
 cd $TEMPBUILD_DIR
360
 make $IMAGE_TYPE \
360
 make $IMAGE_TYPE \
361
-	 MY_USERNAME="$USERNAME" \
362
-	 MY_PASSWORD="$PASSWORD" \
361
+	 MYUSERNAME="$USERNAME" \
362
+	 MYPASSWORD="$PASSWORD" \
363
 	 ROUTER_IP_ADDRESS="$ROUTER_IP_ADDRESS" \
363
 	 ROUTER_IP_ADDRESS="$ROUTER_IP_ADDRESS" \
364
 	 BOX_IP_ADDRESS="$BOX_IP_ADDRESS" \
364
 	 BOX_IP_ADDRESS="$BOX_IP_ADDRESS" \
365
 	 NAMESERVER1="$NAMESERVER1" \
365
 	 NAMESERVER1="$NAMESERVER1" \

+ 5
- 1
src/freedombone-image-customise Dosyayı Görüntüle

523
 	configure_firewall
523
 	configure_firewall
524
 	install_avahi
524
 	install_avahi
525
 	install_batman
525
 	install_batman
526
-	install_tox_node
526
+	install_tox
527
 	install_web_server
527
 	install_web_server
528
 	install_zeronet
528
 	install_zeronet
529
 
529
 
701
 # are not created yet.
701
 # are not created yet.
702
 export TMP=/tmp/ TMPDIR=/tmp/
702
 export TMP=/tmp/ TMPDIR=/tmp/
703
 
703
 
704
+if [ ! $MY_USERNAME ]; then
705
+	echo $'No username was specified'
706
+	exit 52825
707
+fi
704
 username=$MY_USERNAME
708
 username=$MY_USERNAME
705
 echo $"warning: creating initial user $username with well known password!"
709
 echo $"warning: creating initial user $username with well known password!"
706
 password=$MY_PASSWORD
710
 password=$MY_PASSWORD

+ 8
- 4
src/freedombone-image-make Dosyayı Görüntüle

47
 export MACHINE
47
 export MACHINE
48
 export SOURCE
48
 export SOURCE
49
 export SUITE
49
 export SUITE
50
-export MY_USERNAME
51
-export MY_PASSWORD
50
+export MYUSERNAME
51
+export MYPASSWORD
52
 export ROUTER_IP_ADDRESS
52
 export ROUTER_IP_ADDRESS
53
 export BOX_IP_ADDRESS
53
 export BOX_IP_ADDRESS
54
 export NAMESERVER1
54
 export NAMESERVER1
194
 
194
 
195
 echo $'Changing values within customised customisation script'
195
 echo $'Changing values within customised customisation script'
196
 cp $PROJECT_INSTALL_DIR/${PROJECT_NAME}-image-customise $TEMP_CUSTOMISE3
196
 cp $PROJECT_INSTALL_DIR/${PROJECT_NAME}-image-customise $TEMP_CUSTOMISE3
197
-sed -i "s|MY_USERNAME=.*|MY_USERNAME=${MY_USERNAME}|g" $TEMP_CUSTOMISE3
198
-sed -i "s|MY_PASSWORD=.*|MY_PASSWORD=${MY_PASSWORD}|g" $TEMP_CUSTOMISE3
197
+if [ $MYUSERNAME ]; then
198
+	sed -i "s|MY_USERNAME=.*|MY_USERNAME=${MYUSERNAME}|g" $TEMP_CUSTOMISE3
199
+fi
200
+if [ $MYPASSWORD ]; then
201
+	sed -i "s|MY_PASSWORD=.*|MY_PASSWORD=${MYPASSWORD}|g" $TEMP_CUSTOMISE3
202
+fi
199
 sed -i "s|ROUTER_IP_ADDRESS=.*|ROUTER_IP_ADDRESS=${ROUTER_IP_ADDRESS}|g" $TEMP_CUSTOMISE3
203
 sed -i "s|ROUTER_IP_ADDRESS=.*|ROUTER_IP_ADDRESS=${ROUTER_IP_ADDRESS}|g" $TEMP_CUSTOMISE3
200
 sed -i "s|BOX_IP_ADDRESS=.*|BOX_IP_ADDRESS=${BOX_IP_ADDRESS}|g" $TEMP_CUSTOMISE3
204
 sed -i "s|BOX_IP_ADDRESS=.*|BOX_IP_ADDRESS=${BOX_IP_ADDRESS}|g" $TEMP_CUSTOMISE3
201
 sed -i "s|NAMESERVER1=.*|NAMESERVER1=${NAMESERVER1}|g" $TEMP_CUSTOMISE3
205
 sed -i "s|NAMESERVER1=.*|NAMESERVER1=${NAMESERVER1}|g" $TEMP_CUSTOMISE3