|
@@ -104,16 +104,16 @@ DH_KEYLENGTH=
|
104
|
104
|
|
105
|
105
|
function show_help {
|
106
|
106
|
echo ''
|
107
|
|
- echo 'freedombone-config -f [config filename] -m [min password length]'
|
|
107
|
+ echo $'freedombone-config -f [config filename] -m [min password length]'
|
108
|
108
|
echo ''
|
109
|
|
- echo 'Creates an inventory of remote backup locations'
|
|
109
|
+ echo $'Creates an inventory of remote backup locations'
|
110
|
110
|
echo ''
|
111
|
111
|
echo ''
|
112
|
|
- echo ' -h --help Show help'
|
113
|
|
- echo ' -f --filename Configuration file (usually freedombone.cfg)'
|
114
|
|
- echo ' -m --min Minimum password length (characters)'
|
115
|
|
- echo ' -w --www Freedombone web site'
|
116
|
|
- echo ' -b --bm Freedombone support Bitmessage address'
|
|
112
|
+ echo $' -h --help Show help'
|
|
113
|
+ echo $' -f --filename Configuration file (usually freedombone.cfg)'
|
|
114
|
+ echo $' -m --min Minimum password length (characters)'
|
|
115
|
+ echo $' -w --www Freedombone web site'
|
|
116
|
+ echo $' -b --bm Freedombone support Bitmessage address'
|
117
|
117
|
echo ''
|
118
|
118
|
exit 0
|
119
|
119
|
}
|
|
@@ -276,15 +276,15 @@ function interactive_gpg_from_remote {
|
276
|
276
|
freedombone-remote -u $MY_USERNAME -l $REMOTE_SERVERS_LIST -t "Remote server"
|
277
|
277
|
|
278
|
278
|
if [ ! -f $REMOTE_SERVERS_LIST ]; then
|
279
|
|
- dialog --title "Encryption keys" --msgbox 'Error obtaining server list' 6 70
|
|
279
|
+ dialog --title $"Encryption keys" --msgbox $'Error obtaining server list' 6 70
|
280
|
280
|
return 1
|
281
|
281
|
fi
|
282
|
282
|
|
283
|
283
|
# check the number of entries in the file
|
284
|
284
|
no_of_servers=$(cat $REMOTE_SERVERS_LIST | wc -l)
|
285
|
285
|
if (( no_of_servers < 3 )); then
|
286
|
|
- dialog --title "Encryption keys" \
|
287
|
|
- --msgbox 'There must be at least three servers to recover the key' 6 70
|
|
286
|
+ dialog --title $"Encryption keys" \
|
|
287
|
+ --msgbox $'There must be at least three servers to recover the key' 6 70
|
288
|
288
|
return 2
|
289
|
289
|
fi
|
290
|
290
|
|
|
@@ -292,11 +292,11 @@ function interactive_gpg_from_remote {
|
292
|
292
|
apt-get -y install libgfshare-bin gnupg
|
293
|
293
|
freedombone-recoverkey -u $MY_USERNAME -l $REMOTE_SERVERS_LIST
|
294
|
294
|
if [ ! "$?" = "0" ]; then
|
295
|
|
- dialog --title "Encryption keys" --msgbox 'Your key could not be recovered' 6 70
|
|
295
|
+ dialog --title $"Encryption keys" --msgbox $'Your key could not be recovered' 6 70
|
296
|
296
|
return 3
|
297
|
297
|
fi
|
298
|
298
|
|
299
|
|
- dialog --title "Encryption keys" --msgbox 'Your key has been recovered' 6 70
|
|
299
|
+ dialog --title $"Encryption keys" --msgbox $'Your key has been recovered' 6 70
|
300
|
300
|
|
301
|
301
|
return 0
|
302
|
302
|
}
|
|
@@ -308,36 +308,36 @@ function reconstruct_key {
|
308
|
308
|
cd /home/$MY_USERNAME/.gnupg_fragments
|
309
|
309
|
no_of_shares=$(ls -afq keyshare.asc.* | wc -l)
|
310
|
310
|
if (( no_of_shares < 4 )); then
|
311
|
|
- dialog --title "Encryption keys" --msgbox 'Not enough fragments to reconstruct the key' 6 70
|
|
311
|
+ dialog --title $"Encryption keys" --msgbox $'Not enough fragments to reconstruct the key' 6 70
|
312
|
312
|
exit 7348
|
313
|
313
|
fi
|
314
|
314
|
apt-get -y install libgfshare-bin gnupg
|
315
|
315
|
gfcombine /home/$MY_USERNAME/.gnupg_fragments/keyshare*
|
316
|
316
|
if [ ! "$?" = "0" ]; then
|
317
|
|
- dialog --title "Encryption keys" --msgbox 'Unable to reconstruct the key' 6 70
|
|
317
|
+ dialog --title $"Encryption keys" --msgbox $'Unable to reconstruct the key' 6 70
|
318
|
318
|
exit 7348
|
319
|
319
|
fi
|
320
|
320
|
|
321
|
321
|
KEYS_FILE=/home/$MY_USERNAME/.gnupg_fragments/keyshare.asc
|
322
|
322
|
if [ ! -f $KEYS_FILE ]; then
|
323
|
|
- dialog --title "Encryption keys" --msgbox 'Unable to reconstruct the key' 6 70
|
|
323
|
+ dialog --title $"Encryption keys" --msgbox $'Unable to reconstruct the key' 6 70
|
324
|
324
|
fi
|
325
|
325
|
|
326
|
326
|
su -c "gpg --allow-secret-key-import --import $KEYS_FILE" - $MY_USERNAME
|
327
|
327
|
if [ ! "$?" = "0" ]; then
|
328
|
|
- echo 'Unable to import gpg key'
|
|
328
|
+ echo $'Unable to import gpg key'
|
329
|
329
|
shred -zu $KEYS_FILE
|
330
|
330
|
rm -rf /home/$MY_USERNAME/.tempgnupg
|
331
|
331
|
exit 9654
|
332
|
332
|
fi
|
333
|
333
|
shred -zu $KEYS_FILE
|
334
|
334
|
|
335
|
|
- dialog --title "Encryption keys" --msgbox 'Key has been reconstructed' 6 70
|
|
335
|
+ dialog --title $"Encryption keys" --msgbox $'Key has been reconstructed' 6 70
|
336
|
336
|
}
|
337
|
337
|
|
338
|
338
|
function interactive_gpg_from_usb {
|
339
|
|
- dialog --title "Encryption keys" \
|
340
|
|
- --msgbox 'Plug in a USB drive containing a copy of your full key or key fragment' 6 70
|
|
339
|
+ dialog --title $"Encryption keys" \
|
|
340
|
+ --msgbox $'Plug in a USB drive containing a copy of your full key or key fragment' 6 70
|
341
|
341
|
|
342
|
342
|
HOME_DIR=/home/$MY_USERNAME
|
343
|
343
|
GPG_LOADING="yes"
|
|
@@ -352,7 +352,7 @@ function interactive_gpg_from_usb {
|
352
|
352
|
reconstruct_key
|
353
|
353
|
return 0
|
354
|
354
|
fi
|
355
|
|
- dialog --title "Encryption keys" --msgbox 'No USB drive found' 6 30
|
|
355
|
+ dialog --title $"Encryption keys" --msgbox $'No USB drive found' 6 30
|
356
|
356
|
exit 739836
|
357
|
357
|
fi
|
358
|
358
|
else
|
|
@@ -366,7 +366,7 @@ function interactive_gpg_from_usb {
|
366
|
366
|
reconstruct_key
|
367
|
367
|
return 0
|
368
|
368
|
fi
|
369
|
|
- dialog --title "Encryption keys" --msgbox 'No USB drive found' 6 30
|
|
369
|
+ dialog --title $"Encryption keys" --msgbox $'No USB drive found' 6 30
|
370
|
370
|
exit 27852
|
371
|
371
|
fi
|
372
|
372
|
fi
|
|
@@ -394,8 +394,8 @@ function interactive_gpg_from_usb {
|
394
|
394
|
reconstruct_key
|
395
|
395
|
return 0
|
396
|
396
|
fi
|
397
|
|
- dialog --title "Encryption keys" \
|
398
|
|
- --msgbox "There was a problem mounting the USB drive to $GPG_USB_MOUNT" 6 70
|
|
397
|
+ dialog --title $"Encryption keys" \
|
|
398
|
+ --msgbox $"There was a problem mounting the USB drive to $GPG_USB_MOUNT" 6 70
|
399
|
399
|
rm -rf $GPG_USB_MOUNT
|
400
|
400
|
exit 74393
|
401
|
401
|
fi
|
|
@@ -408,8 +408,8 @@ function interactive_gpg_from_usb {
|
408
|
408
|
reconstruct_key
|
409
|
409
|
return 0
|
410
|
410
|
fi
|
411
|
|
- dialog --title "Encryption keys" \
|
412
|
|
- --msgbox "The directory $GPG_USB_MOUNT/.gnupg or $GPG_USB_MOUNT/.gnupg_fragments was not found" 6 70
|
|
411
|
+ dialog --title $"Encryption keys" \
|
|
412
|
+ --msgbox $"The directory $GPG_USB_MOUNT/.gnupg or $GPG_USB_MOUNT/.gnupg_fragments was not found" 6 70
|
413
|
413
|
umount -f $GPG_USB_MOUNT
|
414
|
414
|
rm -rf $GPG_USB_MOUNT
|
415
|
415
|
exit 723814
|
|
@@ -422,8 +422,8 @@ function interactive_gpg_from_usb {
|
422
|
422
|
fi
|
423
|
423
|
cp -r $GPG_USB_MOUNT/.gnupg/* $HOME_DIR/.gnupg
|
424
|
424
|
GPG_LOADING="no"
|
425
|
|
- dialog --title "Encryption keys" \
|
426
|
|
- --msgbox "GPG Keyring loaded to $HOME_DIR" 6 70
|
|
425
|
+ dialog --title $"Encryption keys" \
|
|
426
|
+ --msgbox $"GPG Keyring loaded to $HOME_DIR" 6 70
|
427
|
427
|
else
|
428
|
428
|
if [ ! -d $HOME_DIR/.gnupg_fragments ]; then
|
429
|
429
|
mkdir $HOME_DIR/.gnupg_fragments
|
|
@@ -437,8 +437,8 @@ function interactive_gpg_from_usb {
|
437
|
437
|
mkdir $HOME_DIR/.ssh
|
438
|
438
|
fi
|
439
|
439
|
cp $GPG_USB_MOUNT/.ssh/* $HOME_DIR/.ssh
|
440
|
|
- dialog --title "Encryption keys" \
|
441
|
|
- --msgbox "ssh keys imported" 6 70
|
|
440
|
+ dialog --title $"Encryption keys" \
|
|
441
|
+ --msgbox $"ssh keys imported" 6 70
|
442
|
442
|
SSH_IMPORTED="yes"
|
443
|
443
|
fi
|
444
|
444
|
fi
|
|
@@ -446,8 +446,8 @@ function interactive_gpg_from_usb {
|
446
|
446
|
umount -f $GPG_USB_MOUNT
|
447
|
447
|
rm -rf $GPG_USB_MOUNT
|
448
|
448
|
if [[ $GPG_LOADING == "yes" ]]; then
|
449
|
|
- dialog --title "Encryption keys" \
|
450
|
|
- --msgbox "Now remove the USB drive. Insert the next drive containing a key fragment, or select Ok to finish" 6 70
|
|
449
|
+ dialog --title $"Encryption keys" \
|
|
450
|
+ --msgbox $"Now remove the USB drive. Insert the next drive containing a key fragment, or select Ok to finish" 6 70
|
451
|
451
|
fi
|
452
|
452
|
GPG_CTR=$((GPG_CTR + 1))
|
453
|
453
|
done
|
|
@@ -460,11 +460,11 @@ function interactive_gpg {
|
460
|
460
|
GPG_CONFIGURED="yes"
|
461
|
461
|
data=$(tempfile 2>/dev/null)
|
462
|
462
|
trap "rm -f $data" 0 1 2 5 15
|
463
|
|
- dialog --backtitle "Freedombone Configuration" \
|
464
|
|
- --radiolist "GPG/PGP keys for your system:" 13 70 3 \
|
465
|
|
- 1 "Generate new keys (new user)" on \
|
466
|
|
- 2 "Import keys from USB drive/s" off \
|
467
|
|
- 3 "Retrieve keys from friends servers" off 2> $data
|
|
463
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
464
|
+ --radiolist $"GPG/PGP keys for your system:" 13 70 3 \
|
|
465
|
+ 1 $"Generate new keys (new user)" on \
|
|
466
|
+ 2 $"Import keys from USB drive/s" off \
|
|
467
|
+ 3 $"Retrieve keys from friends servers" off 2> $data
|
468
|
468
|
sel=$?
|
469
|
469
|
case $sel in
|
470
|
470
|
1) exit 1;;
|
|
@@ -489,25 +489,25 @@ function interactive_configuration {
|
489
|
489
|
cp $CONFIGURATION_FILE temp.cfg
|
490
|
490
|
fi
|
491
|
491
|
|
492
|
|
- FREEDNS_MESSAGE="Please enter the FreeDNS code for this domain.\n\nThe code can be found by going to https://freedns.afraid.org, selecting 'Dynamic DNS' and then opening 'Wget example'. The code will consist of letters and numbers and be between the ? and = characters."
|
|
492
|
+ FREEDNS_MESSAGE=$"Please enter the FreeDNS code for this domain.\n\nThe code can be found by going to https://freedns.afraid.org, selecting 'Dynamic DNS' and then opening 'Wget example'. The code will consist of letters and numbers and be between the ? and = characters."
|
493
|
493
|
|
494
|
|
- dialog --title "Freedombone" --msgbox "Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\n\nEnsure that you have your domain and dynamic DNS settings ready.\n\nFor more information please visit $FREEDOMBONE_WEBSITE or send a Bitmessage to $FREEDOMBONE_BITMESSAGE" 15 50
|
|
494
|
+ dialog --title $"Freedombone" --msgbox $"Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\n\nEnsure that you have your domain and dynamic DNS settings ready.\n\nFor more information please visit $FREEDOMBONE_WEBSITE or send a Bitmessage to $FREEDOMBONE_BITMESSAGE" 15 50
|
495
|
495
|
|
496
|
496
|
data=$(tempfile 2>/dev/null)
|
497
|
497
|
trap "rm -f $data" 0 1 2 5 15
|
498
|
|
- dialog --backtitle "Freedombone Configuration" \
|
499
|
|
- --radiolist "Type of Installation:" 18 40 11 \
|
500
|
|
- 1 Full on \
|
501
|
|
- 2 Writer off \
|
502
|
|
- 3 Cloud off \
|
503
|
|
- 4 Chat off \
|
504
|
|
- 5 Mailbox off \
|
505
|
|
- 6 Non-Mailbox off \
|
506
|
|
- 7 Social off \
|
507
|
|
- 8 Media off \
|
508
|
|
- 9 Developer off \
|
509
|
|
- 10 "Mesh (router)" off \
|
510
|
|
- 11 "Mesh (user device)" off 2> $data
|
|
498
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
499
|
+ --radiolist $"Type of Installation:" 18 40 11 \
|
|
500
|
+ 1 $"Full" on \
|
|
501
|
+ 2 $"Writer" off \
|
|
502
|
+ 3 $"Cloud" off \
|
|
503
|
+ 4 $"Chat" off \
|
|
504
|
+ 5 $"Mailbox" off \
|
|
505
|
+ 6 $"Non-Mailbox" off \
|
|
506
|
+ 7 $"Social" off \
|
|
507
|
+ 8 $"Media" off \
|
|
508
|
+ 9 $"Developer" off \
|
|
509
|
+ 10 $"Mesh (router)" off \
|
|
510
|
+ 11 $"Mesh (user device)" off 2> $data
|
511
|
511
|
sel=$?
|
512
|
512
|
case $sel in
|
513
|
513
|
1) exit 1;;
|
|
@@ -554,8 +554,8 @@ function interactive_configuration {
|
554
|
554
|
|
555
|
555
|
data=$(tempfile 2>/dev/null)
|
556
|
556
|
trap "rm -f $data" 0 1 2 5 15
|
557
|
|
- dialog --backtitle "Freedombone Configuration" \
|
558
|
|
- --inputbox "Wireless Mesh ESSID\n\nIf you press enter the default will be '$ESSID'" 10 40 "$(grep 'ESSID' temp.cfg | awk -F '=' '{print $2}')" 2> $data
|
|
557
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
558
|
+ --inputbox $"Wireless Mesh ESSID\n\nIf you press enter the default will be '$ESSID'" 10 40 "$(grep 'ESSID' temp.cfg | awk -F '=' '{print $2}')" 2> $data
|
559
|
559
|
sel=$?
|
560
|
560
|
case $sel in
|
561
|
561
|
0) ESSID=$(cat $data);;
|
|
@@ -567,8 +567,8 @@ function interactive_configuration {
|
567
|
567
|
if [[ $SYSTEM_TYPE != "$VARIANT_MESH_USER" ]]; then
|
568
|
568
|
data=$(tempfile 2>/dev/null)
|
569
|
569
|
trap "rm -f $data" 0 1 2 5 15
|
570
|
|
- dialog --backtitle "Freedombone Configuration" \
|
571
|
|
- --inputbox "Give your mesh peer a name" 10 40 "$(grep 'DEFAULT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
|
|
570
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
571
|
+ --inputbox $"Give your mesh peer a name" 10 40 "$(grep 'DEFAULT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
|
572
|
572
|
sel=$?
|
573
|
573
|
case $sel in
|
574
|
574
|
0) DEFAULT_DOMAIN_NAME=$(cat $data);;
|
|
@@ -582,8 +582,8 @@ function interactive_configuration {
|
582
|
582
|
|
583
|
583
|
data=$(tempfile 2>/dev/null)
|
584
|
584
|
trap "rm -f $data" 0 1 2 5 15
|
585
|
|
- dialog --backtitle "Freedombone Configuration" \
|
586
|
|
- --radiolist "Wifi Channel (spaced to be non-overlapping):" 11 50 4 \
|
|
585
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
586
|
+ --radiolist $"Wifi Channel (spaced to be non-overlapping):" 11 50 4 \
|
587
|
587
|
1 "1" on \
|
588
|
588
|
2 "5" off \
|
589
|
589
|
3 "9" off \
|
|
@@ -626,23 +626,23 @@ function interactive_configuration {
|
626
|
626
|
echo "| | (.-' (.-' ( | ( )| | | | )( )| | (.-' "
|
627
|
627
|
echo "' ' --' --' -' - -' ' ' -' -' -' ' - --'"
|
628
|
628
|
echo ''
|
629
|
|
- echo 'Your system is now ready for connection to the mesh network'
|
|
629
|
+ echo $'Your system is now ready for connection to the mesh network'
|
630
|
630
|
echo ''
|
631
|
|
- echo 'To connect to the network open a terminal and type:'
|
|
631
|
+ echo $'To connect to the network open a terminal and type:'
|
632
|
632
|
echo ''
|
633
|
633
|
echo ' meshweb'
|
634
|
634
|
echo ''
|
635
|
|
- echo 'To disconnect from the mesh and return to the internet type:'
|
|
635
|
+ echo $'To disconnect from the mesh and return to the internet type:'
|
636
|
636
|
echo ''
|
637
|
637
|
echo ' sudo batman stop'
|
638
|
638
|
echo ''
|
639
|
|
- echo 'To turn your system into a dedicated mesh peer you could add'
|
640
|
|
- echo 'the meshweb command to your startup applications'
|
|
639
|
+ echo $'To turn your system into a dedicated mesh peer you could add'
|
|
640
|
+ echo $'the meshweb command to your startup applications'
|
641
|
641
|
echo ''
|
642
|
642
|
touch /tmp/meshuserdevice
|
643
|
643
|
exit 0
|
644
|
644
|
else
|
645
|
|
- echo 'Failed to fully install the mesh networking system'
|
|
645
|
+ echo $'Failed to fully install the mesh networking system'
|
646
|
646
|
exit 74589
|
647
|
647
|
fi
|
648
|
648
|
fi
|
|
@@ -652,8 +652,8 @@ function interactive_configuration {
|
652
|
652
|
else
|
653
|
653
|
data=$(tempfile 2>/dev/null)
|
654
|
654
|
trap "rm -f $data" 0 1 2 5 15
|
655
|
|
- dialog --title "Select the user account to install as" \
|
656
|
|
- --backtitle "Freedombone Configuration" \
|
|
655
|
+ dialog --title $"Select the user account to install as" \
|
|
656
|
+ --backtitle $"Freedombone Configuration" \
|
657
|
657
|
--dselect "/home/$(grep 'MY_USERNAME' temp.cfg | awk -F '=' '{print $2}')" 14 40 2> $data
|
658
|
658
|
sel=$?
|
659
|
659
|
case $sel in
|
|
@@ -664,32 +664,32 @@ function interactive_configuration {
|
664
|
664
|
fi
|
665
|
665
|
|
666
|
666
|
if [ ! $MY_USERNAME ]; then
|
667
|
|
- echo 'No user account was selected'
|
|
667
|
+ echo $'No user account was selected'
|
668
|
668
|
exit 64398
|
669
|
669
|
fi
|
670
|
670
|
if [[ $MY_USERNAME == '-f' ]]; then
|
671
|
|
- echo 'No user account was selected'
|
|
671
|
+ echo $'No user account was selected'
|
672
|
672
|
exit 8347
|
673
|
673
|
fi
|
674
|
674
|
if [[ $MY_USERNAME == 'debian' ]]; then
|
675
|
|
- echo "Don't use the default debian user account"
|
|
675
|
+ echo $"Don't use the default debian user account"
|
676
|
676
|
exit 9341
|
677
|
677
|
fi
|
678
|
678
|
if [ ! -d /home/$MY_USERNAME ]; then
|
679
|
|
- echo "The directory /home/$MY_USERNAME does not exist"
|
|
679
|
+ echo $"The directory /home/$MY_USERNAME does not exist"
|
680
|
680
|
exit 6437
|
681
|
681
|
fi
|
682
|
682
|
save_configuration_file
|
683
|
683
|
|
684
|
684
|
if [[ $(grep "INSTALLING_ON_BBB" temp.cfg | awk -F '=' '{print $2}') == "yes" ]]; then
|
685
|
|
- dialog --title "Install Target" \
|
686
|
|
- --backtitle "Freedombone Configuration" \
|
687
|
|
- --yesno "\nAre you installing onto a Beaglebone Black?" 7 60
|
|
685
|
+ dialog --title $"Install Target" \
|
|
686
|
+ --backtitle $"Freedombone Configuration" \
|
|
687
|
+ --yesno $"\nAre you installing onto a Beaglebone Black?" 7 60
|
688
|
688
|
else
|
689
|
|
- dialog --title "Install Target" \
|
690
|
|
- --backtitle "Freedombone Configuration" \
|
|
689
|
+ dialog --title $"Install Target" \
|
|
690
|
+ --backtitle $"Freedombone Configuration" \
|
691
|
691
|
--defaultno \
|
692
|
|
- --yesno "\nAre you installing onto a Beaglebone Black?" 7 60
|
|
692
|
+ --yesno $"\nAre you installing onto a Beaglebone Black?" 7 60
|
693
|
693
|
fi
|
694
|
694
|
sel=$?
|
695
|
695
|
case $sel in
|
|
@@ -712,14 +712,14 @@ function interactive_configuration {
|
712
|
712
|
|
713
|
713
|
data=$(tempfile 2>/dev/null)
|
714
|
714
|
trap "rm -f $data" 0 1 2 5 15
|
715
|
|
- SOCIAL_KEY_STR="\nDo you wish to enable social key management, otherwise known as \"the unforgettable key\"?\n\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \"no\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient."
|
|
715
|
+ SOCIAL_KEY_STR=$"\nDo you wish to enable social key management, otherwise known as \"the unforgettable key\"?\n\nThis means that fragments of your GPG key will be included with any remote backups so that if you later lose your key then it can be reconstructed from your friends servers. If you select \"no\" then you can still do social key management, but offline using physical USB thumb drives, which is more secure but less convenient."
|
716
|
716
|
if [[ $(grep "ENABLE_SOCIAL_KEY_MANAGEMENT" temp.cfg | awk -F '=' '{print $2}') == "yes" ]]; then
|
717
|
|
- dialog --title "Social Key Management" \
|
718
|
|
- --backtitle "Freedombone Configuration" \
|
|
717
|
+ dialog --title $"Social Key Management" \
|
|
718
|
+ --backtitle $"Freedombone Configuration" \
|
719
|
719
|
--yesno "$SOCIAL_KEY_STR" 15 60
|
720
|
720
|
else
|
721
|
|
- dialog --title "Social Key Management" \
|
722
|
|
- --backtitle "Freedombone Configuration" \
|
|
721
|
+ dialog --title $"Social Key Management" \
|
|
722
|
+ --backtitle $"Freedombone Configuration" \
|
723
|
723
|
--defaultno \
|
724
|
724
|
--yesno "$SOCIAL_KEY_STR" 15 60
|
725
|
725
|
fi
|
|
@@ -734,8 +734,8 @@ function interactive_configuration {
|
734
|
734
|
data=$(tempfile 2>/dev/null)
|
735
|
735
|
trap "rm -f $data" 0 1 2 5 15
|
736
|
736
|
if [[ $INSTALLING_ON_BBB != "yes" ]]; then
|
737
|
|
- dialog --backtitle "Freedombone Configuration" \
|
738
|
|
- --radiolist "Type of Random Number Generator:" 10 40 2 \
|
|
737
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
738
|
+ --radiolist $"Type of Random Number Generator:" 10 40 2 \
|
739
|
739
|
1 Haveged on \
|
740
|
740
|
2 OneRNG off 2> $data
|
741
|
741
|
sel=$?
|
|
@@ -745,8 +745,8 @@ function interactive_configuration {
|
745
|
745
|
esac
|
746
|
746
|
case $(cat $data) in
|
747
|
747
|
2) HWRNG_TYPE="onerng"
|
748
|
|
- dialog --title "OneRNG Device" \
|
749
|
|
- --msgbox "Please ensure that the OneRNG device is disconnected. You can reconnect it later during the installation" 8 60
|
|
748
|
+ dialog --title $"OneRNG Device" \
|
|
749
|
+ --msgbox $"Please ensure that the OneRNG device is disconnected. You can reconnect it later during the installation" 8 60
|
750
|
750
|
;;
|
751
|
751
|
255) exit 1;;
|
752
|
752
|
esac
|
|
@@ -757,57 +757,57 @@ function interactive_configuration {
|
757
|
757
|
|
758
|
758
|
data=$(tempfile 2>/dev/null)
|
759
|
759
|
trap "rm -f $data" 0 1 2 5 15
|
760
|
|
- dialog --backtitle "Freedombone Configuration" \
|
761
|
|
- --radiolist "Where to download Debian packages from:" 25 45 49 \
|
762
|
|
- 1 "Australia" off \
|
763
|
|
- 2 "Austria" off \
|
764
|
|
- 3 "Belarus" off \
|
765
|
|
- 4 "Belgium" off \
|
766
|
|
- 5 "Bosnia and Herzegovina" off \
|
767
|
|
- 6 "Brazil" off \
|
768
|
|
- 7 "Bulgaria" off \
|
769
|
|
- 8 "Canada" off \
|
770
|
|
- 9 "Chile" off \
|
771
|
|
- 10 "China" off \
|
772
|
|
- 11 "Croatia" off \
|
773
|
|
- 12 "Czech Republic" off \
|
774
|
|
- 13 "Denmark" off \
|
775
|
|
- 14 "El Salvador" off \
|
776
|
|
- 15 "Estonia" off \
|
777
|
|
- 16 "Finland" off \
|
778
|
|
- 17 "France 1" off \
|
779
|
|
- 18 "France 2" off \
|
780
|
|
- 19 "Germany 1" off \
|
781
|
|
- 20 "Germany 2" off \
|
782
|
|
- 21 "Greece" off \
|
783
|
|
- 22 "Hungary" off \
|
784
|
|
- 23 "Iceland" off \
|
785
|
|
- 24 "Iran" off \
|
786
|
|
- 25 "Ireland" off \
|
787
|
|
- 26 "Italy" off \
|
788
|
|
- 27 "Japan" off \
|
789
|
|
- 28 "Korea" off \
|
790
|
|
- 29 "Lithuania" off \
|
791
|
|
- 30 "Mexico" off \
|
792
|
|
- 31 "Netherlands" off \
|
793
|
|
- 32 "New Caledonia" off \
|
794
|
|
- 33 "New Zealand" off \
|
795
|
|
- 34 "Norway" off \
|
796
|
|
- 35 "Poland" off \
|
797
|
|
- 36 "Portugal" off \
|
798
|
|
- 37 "Romania" off \
|
799
|
|
- 38 "Russia" off \
|
800
|
|
- 39 "Slovakia" off \
|
801
|
|
- 40 "Slovenia" off \
|
802
|
|
- 41 "Spain" off \
|
803
|
|
- 42 "Sweden" off \
|
804
|
|
- 43 "Switzerland" off \
|
805
|
|
- 44 "Taiwan" off \
|
806
|
|
- 45 "Thailand" off \
|
807
|
|
- 46 "Turkey" off \
|
808
|
|
- 47 "Ukraine" off \
|
809
|
|
- 48 "United Kingdom" off \
|
810
|
|
- 49 "United States" on 2> $data
|
|
760
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
761
|
+ --radiolist $"Where to download Debian packages from:" 25 45 49 \
|
|
762
|
+ 1 $"Australia" off \
|
|
763
|
+ 2 $"Austria" off \
|
|
764
|
+ 3 $"Belarus" off \
|
|
765
|
+ 4 $"Belgium" off \
|
|
766
|
+ 5 $"Bosnia and Herzegovina" off \
|
|
767
|
+ 6 $"Brazil" off \
|
|
768
|
+ 7 $"Bulgaria" off \
|
|
769
|
+ 8 $"Canada" off \
|
|
770
|
+ 9 $"Chile" off \
|
|
771
|
+ 10 $"China" off \
|
|
772
|
+ 11 $"Croatia" off \
|
|
773
|
+ 12 $"Czech Republic" off \
|
|
774
|
+ 13 $"Denmark" off \
|
|
775
|
+ 14 $"El Salvador" off \
|
|
776
|
+ 15 $"Estonia" off \
|
|
777
|
+ 16 $"Finland" off \
|
|
778
|
+ 17 $"France 1" off \
|
|
779
|
+ 18 $"France 2" off \
|
|
780
|
+ 19 $"Germany 1" off \
|
|
781
|
+ 20 $"Germany 2" off \
|
|
782
|
+ 21 $"Greece" off \
|
|
783
|
+ 22 $"Hungary" off \
|
|
784
|
+ 23 $"Iceland" off \
|
|
785
|
+ 24 $"Iran" off \
|
|
786
|
+ 25 $"Ireland" off \
|
|
787
|
+ 26 $"Italy" off \
|
|
788
|
+ 27 $"Japan" off \
|
|
789
|
+ 28 $"Korea" off \
|
|
790
|
+ 29 $"Lithuania" off \
|
|
791
|
+ 30 $"Mexico" off \
|
|
792
|
+ 31 $"Netherlands" off \
|
|
793
|
+ 32 $"New Caledonia" off \
|
|
794
|
+ 33 $"New Zealand" off \
|
|
795
|
+ 34 $"Norway" off \
|
|
796
|
+ 35 $"Poland" off \
|
|
797
|
+ 36 $"Portugal" off \
|
|
798
|
+ 37 $"Romania" off \
|
|
799
|
+ 38 $"Russia" off \
|
|
800
|
+ 39 $"Slovakia" off \
|
|
801
|
+ 40 $"Slovenia" off \
|
|
802
|
+ 41 $"Spain" off \
|
|
803
|
+ 42 $"Sweden" off \
|
|
804
|
+ 43 $"Switzerland" off \
|
|
805
|
+ 44 $"Taiwan" off \
|
|
806
|
+ 45 $"Thailand" off \
|
|
807
|
+ 46 $"Turkey" off \
|
|
808
|
+ 47 $"Ukraine" off \
|
|
809
|
+ 48 $"United Kingdom" off \
|
|
810
|
+ 49 $"United States" on 2> $data
|
811
|
811
|
sel=$?
|
812
|
812
|
case $sel in
|
813
|
813
|
1) exit 1;;
|
|
@@ -869,24 +869,24 @@ function interactive_configuration {
|
869
|
869
|
|
870
|
870
|
data=$(tempfile 2>/dev/null)
|
871
|
871
|
trap "rm -f $data" 0 1 2 5 15
|
872
|
|
- dialog --backtitle "Freedombone Configuration" \
|
873
|
|
- --radiolist "Pick a domain name service (DNS):" 25 50 16 \
|
874
|
|
- 1 "Digital Courage" on \
|
875
|
|
- 2 "German Privacy Foundation 1" off \
|
876
|
|
- 3 "German Privacy Foundation 2" off \
|
877
|
|
- 4 "Chaos Computer Club" off \
|
878
|
|
- 5 "ClaraNet" off \
|
879
|
|
- 6 "OpenNIC 1" off \
|
880
|
|
- 7 "OpenNIC 2" off \
|
881
|
|
- 8 "OpenNIC 3" off \
|
882
|
|
- 9 "OpenNIC 4" off \
|
883
|
|
- 10 "OpenNIC 5" off \
|
884
|
|
- 11 "OpenNIC 6" off \
|
885
|
|
- 12 "OpenNIC 7" off \
|
886
|
|
- 13 "PowerNS" off \
|
887
|
|
- 14 "ValiDOM" off \
|
888
|
|
- 15 "Freie Unzensierte" off \
|
889
|
|
- 16 "Google" off 2> $data
|
|
872
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
873
|
+ --radiolist $"Pick a domain name service (DNS):" 25 50 16 \
|
|
874
|
+ 1 $"Digital Courage" on \
|
|
875
|
+ 2 $"German Privacy Foundation 1" off \
|
|
876
|
+ 3 $"German Privacy Foundation 2" off \
|
|
877
|
+ 4 $"Chaos Computer Club" off \
|
|
878
|
+ 5 $"ClaraNet" off \
|
|
879
|
+ 6 $"OpenNIC 1" off \
|
|
880
|
+ 7 $"OpenNIC 2" off \
|
|
881
|
+ 8 $"OpenNIC 3" off \
|
|
882
|
+ 9 $"OpenNIC 4" off \
|
|
883
|
+ 10 $"OpenNIC 5" off \
|
|
884
|
+ 11 $"OpenNIC 6" off \
|
|
885
|
+ 12 $"OpenNIC 7" off \
|
|
886
|
+ 13 $"PowerNS" off \
|
|
887
|
+ 14 $"ValiDOM" off \
|
|
888
|
+ 15 $"Freie Unzensierte" off \
|
|
889
|
+ 16 $"Google" off 2> $data
|
890
|
890
|
sel=$?
|
891
|
891
|
case $sel in
|
892
|
892
|
1) exit 1;;
|
|
@@ -949,8 +949,8 @@ function interactive_configuration {
|
949
|
949
|
|
950
|
950
|
data=$(tempfile 2>/dev/null)
|
951
|
951
|
trap "rm -f $data" 0 1 2 5 15
|
952
|
|
- dialog --backtitle "Freedombone Configuration" \
|
953
|
|
- --radiolist "Choose Dynamic DNS provider:" 15 40 14 \
|
|
952
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
953
|
+ --radiolist $"Choose Dynamic DNS provider:" 15 40 14 \
|
954
|
954
|
1 dyndns off \
|
955
|
955
|
2 freedns on \
|
956
|
956
|
3 zoneedit off \
|
|
@@ -993,8 +993,8 @@ function interactive_configuration {
|
993
|
993
|
do
|
994
|
994
|
data=$(tempfile 2>/dev/null)
|
995
|
995
|
trap "rm -f $data" 0 1 2 5 15
|
996
|
|
- dialog --backtitle "Freedombone Configuration" \
|
997
|
|
- --inputbox "Dynamic DNS provider username" 10 30 "$(grep 'DDNS_USERNAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
|
|
996
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
997
|
+ --inputbox $"Dynamic DNS provider username" 10 30 "$(grep 'DDNS_USERNAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
|
998
|
998
|
sel=$?
|
999
|
999
|
case $sel in
|
1000
|
1000
|
0) DDNS_USERNAME=$(cat $data);;
|
|
@@ -1008,10 +1008,10 @@ function interactive_configuration {
|
1008
|
1008
|
do
|
1009
|
1009
|
data=$(tempfile 2>/dev/null)
|
1010
|
1010
|
trap "rm -f $data" 0 1 2 5 15
|
1011
|
|
- dialog --backtitle "Freedombone Configuration" \
|
|
1011
|
+ dialog --backtitle $"Freedombone Configuration" \
|
1012
|
1012
|
--clear \
|
1013
|
1013
|
--insecure \
|
1014
|
|
- --passwordbox "Dynamic DNS provider password" 10 30 "$(grep 'DDNS_PASSWORD' temp.cfg | awk -F '=' '{print $2}')" 2> $data
|
|
1014
|
+ --passwordbox $"Dynamic DNS provider password" 10 30 "$(grep 'DDNS_PASSWORD' temp.cfg | awk -F '=' '{print $2}')" 2> $data
|
1015
|
1015
|
sel=$?
|
1016
|
1016
|
case $sel in
|
1017
|
1017
|
0) DDNS_PASSWORD=$(cat $data);;
|
|
@@ -1019,7 +1019,7 @@ function interactive_configuration {
|
1019
|
1019
|
255) exit 1;;
|
1020
|
1020
|
esac
|
1021
|
1021
|
if [ ${#DDNS_PASSWORD} -lt $MINIMUM_PASSWORD_LENGTH ]; then
|
1022
|
|
- dialog --title "Password quality check" --msgbox "The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site." 10 40
|
|
1022
|
+ dialog --title $"Password quality check" --msgbox $"The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site." 10 40
|
1023
|
1023
|
DDNS_PASSWORD=""
|
1024
|
1024
|
fi
|
1025
|
1025
|
done
|
|
@@ -1031,8 +1031,8 @@ function interactive_configuration {
|
1031
|
1031
|
do
|
1032
|
1032
|
data=$(tempfile 2>/dev/null)
|
1033
|
1033
|
trap "rm -f $data" 0 1 2 5 15
|
1034
|
|
- dialog --backtitle "Freedombone Configuration" \
|
1035
|
|
- --inputbox "Your full name (or nick)" 10 30 "$(grep 'MY_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
|
|
1034
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1035
|
+ --inputbox $"Your full name (or nick)" 10 30 "$(grep 'MY_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
|
1036
|
1036
|
sel=$?
|
1037
|
1037
|
case $sel in
|
1038
|
1038
|
0) MY_NAME=$(cat $data);;
|
|
@@ -1057,11 +1057,11 @@ function interactive_configuration {
|
1057
|
1057
|
fi
|
1058
|
1058
|
data=$(tempfile 2>/dev/null)
|
1059
|
1059
|
trap "rm -f $data" 0 1 2 5 15
|
1060
|
|
- dialog --backtitle "Freedombone Configuration" \
|
1061
|
|
- --title "Local Network Configuration" \
|
1062
|
|
- --form "\nPlease enter the IP addresses:" 11 55 3 \
|
1063
|
|
- "This system:" 1 1 "$LOCAL_NETWORK_STATIC_IP_ADDRESS" 1 16 16 15 \
|
1064
|
|
- "Internet router:" 2 1 "$ROUTER_IP_ADDRESS" 2 16 16 15 \
|
|
1060
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1061
|
+ --title $"Local Network Configuration" \
|
|
1062
|
+ --form $"\nPlease enter the IP addresses:" 11 55 3 \
|
|
1063
|
+ $"This system:" 1 1 "$LOCAL_NETWORK_STATIC_IP_ADDRESS" 1 16 16 15 \
|
|
1064
|
+ $"Internet router:" 2 1 "$ROUTER_IP_ADDRESS" 2 16 16 15 \
|
1065
|
1065
|
2> $data
|
1066
|
1066
|
sel=$?
|
1067
|
1067
|
case $sel in
|
|
@@ -1080,19 +1080,19 @@ function interactive_configuration {
|
1080
|
1080
|
trap "rm -f $data" 0 1 2 5 15
|
1081
|
1081
|
|
1082
|
1082
|
if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1083
|
|
- dialog --backtitle "Freedombone Configuration" \
|
1084
|
|
- --title "Wiki Configuration" \
|
1085
|
|
- --form "\nPlease enter your wiki details:" 11 55 4 \
|
1086
|
|
- "Title:" 1 1 "$(grep 'WIKI_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
|
1087
|
|
- "Domain:" 2 1 "$(grep 'WIKI_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 40 \
|
1088
|
|
- "Code:" 3 1 "$(grep 'WIKI_CODE' temp.cfg | awk -F '=' '{print $2}')" 3 16 25 40 \
|
|
1083
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1084
|
+ --title $"Wiki Configuration" \
|
|
1085
|
+ --form $"\nPlease enter your wiki details:" 11 55 4 \
|
|
1086
|
+ $"Title:" 1 1 "$(grep 'WIKI_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
|
|
1087
|
+ $"Domain:" 2 1 "$(grep 'WIKI_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 40 \
|
|
1088
|
+ $"Code:" 3 1 "$(grep 'WIKI_CODE' temp.cfg | awk -F '=' '{print $2}')" 3 16 25 40 \
|
1089
|
1089
|
2> $data
|
1090
|
1090
|
else
|
1091
|
|
- dialog --backtitle "Freedombone Configuration" \
|
1092
|
|
- --title "Wiki Configuration" \
|
1093
|
|
- --form "\nPlease enter your wiki details:" 11 55 3 \
|
1094
|
|
- "Title:" 1 1 "$(grep 'WIKI_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
|
1095
|
|
- "Domain:" 2 1 "$(grep 'WIKI_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 40 \
|
|
1091
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1092
|
+ --title $"Wiki Configuration" \
|
|
1093
|
+ --form $"\nPlease enter your wiki details:" 11 55 3 \
|
|
1094
|
+ $"Title:" 1 1 "$(grep 'WIKI_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
|
|
1095
|
+ $"Domain:" 2 1 "$(grep 'WIKI_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 40 \
|
1096
|
1096
|
2> $data
|
1097
|
1097
|
fi
|
1098
|
1098
|
sel=$?
|
|
@@ -1107,13 +1107,13 @@ function interactive_configuration {
|
1107
|
1107
|
validate_domain_name
|
1108
|
1108
|
if [[ $TEST_DOMAIN_NAME != $WIKI_DOMAIN_NAME ]]; then
|
1109
|
1109
|
WIKI_DOMAIN_NAME=
|
1110
|
|
- dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1110
|
+ dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
1111
|
1111
|
else
|
1112
|
1112
|
if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1113
|
1113
|
WIKI_CODE=$(cat $data | sed -n 3p)
|
1114
|
1114
|
if [ ${#WIKI_CODE} -lt 30 ]; then
|
1115
|
1115
|
WIKI_DOMAIN_NAME=
|
1116
|
|
- dialog --title "FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1116
|
+ dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
1117
|
1117
|
fi
|
1118
|
1118
|
fi
|
1119
|
1119
|
fi
|
|
@@ -1132,19 +1132,19 @@ function interactive_configuration {
|
1132
|
1132
|
data=$(tempfile 2>/dev/null)
|
1133
|
1133
|
trap "rm -f $data" 0 1 2 5 15
|
1134
|
1134
|
if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1135
|
|
- dialog --backtitle "Freedombone Configuration" \
|
1136
|
|
- --title "Blog Configuration" \
|
1137
|
|
- --form "\nPlease enter your blog details:" 11 55 4 \
|
1138
|
|
- "Title:" 1 1 "$(grep 'MY_BLOG_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
1139
|
|
- "Domain:" 2 1 "$(grep 'FULLBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
1140
|
|
- "Code:" 3 1 "$(grep 'FULLBLOG_CODE' temp.cfg | awk -F '=' '{print $2}')" 3 16 25 30 \
|
|
1135
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1136
|
+ --title $"Blog Configuration" \
|
|
1137
|
+ --form $"\nPlease enter your blog details:" 11 55 4 \
|
|
1138
|
+ $"Title:" 1 1 "$(grep 'MY_BLOG_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
|
1139
|
+ $"Domain:" 2 1 "$(grep 'FULLBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
|
1140
|
+ $"Code:" 3 1 "$(grep 'FULLBLOG_CODE' temp.cfg | awk -F '=' '{print $2}')" 3 16 25 30 \
|
1141
|
1141
|
2> $data
|
1142
|
1142
|
else
|
1143
|
|
- dialog --backtitle "Freedombone Configuration" \
|
1144
|
|
- --title "Blog Configuration" \
|
1145
|
|
- --form "\nPlease enter your blog details:" 11 55 3 \
|
1146
|
|
- "Title:" 1 1 "$(grep 'MY_BLOG_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
1147
|
|
- "Domain:" 2 1 "$(grep 'FULLBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
|
1143
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1144
|
+ --title $"Blog Configuration" \
|
|
1145
|
+ --form $"\nPlease enter your blog details:" 11 55 3 \
|
|
1146
|
+ $"Title:" 1 1 "$(grep 'MY_BLOG_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
|
1147
|
+ $"Domain:" 2 1 "$(grep 'FULLBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
1148
|
1148
|
2> $data
|
1149
|
1149
|
fi
|
1150
|
1150
|
sel=$?
|
|
@@ -1162,13 +1162,13 @@ function interactive_configuration {
|
1162
|
1162
|
validate_domain_name
|
1163
|
1163
|
if [[ $TEST_DOMAIN_NAME != $FULLBLOG_DOMAIN_NAME ]]; then
|
1164
|
1164
|
FULLBLOG_DOMAIN_NAME=
|
1165
|
|
- dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1165
|
+ dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
1166
|
1166
|
else
|
1167
|
1167
|
if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1168
|
1168
|
FULLBLOG_CODE=$(cat $data | sed -n 3p)
|
1169
|
1169
|
if [ ${#FULLBLOG_CODE} -lt 30 ]; then
|
1170
|
1170
|
FULLBLOG_DOMAIN_NAME=
|
1171
|
|
- dialog --title "FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1171
|
+ dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
1172
|
1172
|
fi
|
1173
|
1173
|
fi
|
1174
|
1174
|
fi
|
|
@@ -1187,17 +1187,17 @@ function interactive_configuration {
|
1187
|
1187
|
data=$(tempfile 2>/dev/null)
|
1188
|
1188
|
trap "rm -f $data" 0 1 2 5 15
|
1189
|
1189
|
if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1190
|
|
- dialog --backtitle "Freedombone Configuration" \
|
1191
|
|
- --title "Owncloud Configuration" \
|
1192
|
|
- --form "\nPlease enter your Owncloud details:" 11 55 3 \
|
1193
|
|
- "Domain:" 1 1 "$(grep 'OWNCLOUD_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
1194
|
|
- "Code:" 2 1 "$(grep 'OWNCLOUD_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
|
1190
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1191
|
+ --title $"Owncloud Configuration" \
|
|
1192
|
+ --form $"\nPlease enter your Owncloud details:" 11 55 3 \
|
|
1193
|
+ $"Domain:" 1 1 "$(grep 'OWNCLOUD_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
|
1194
|
+ $"Code:" 2 1 "$(grep 'OWNCLOUD_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
1195
|
1195
|
2> $data
|
1196
|
1196
|
else
|
1197
|
|
- dialog --backtitle "Freedombone Configuration" \
|
1198
|
|
- --title "Owncloud Configuration" \
|
1199
|
|
- --form "\nPlease enter your Owncloud details:" 11 55 3 \
|
1200
|
|
- "Domain:" 1 1 "$(grep 'OWNCLOUD_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
|
1197
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1198
|
+ --title $"Owncloud Configuration" \
|
|
1199
|
+ --form $"\nPlease enter your Owncloud details:" 11 55 3 \
|
|
1200
|
+ $"Domain:" 1 1 "$(grep 'OWNCLOUD_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
1201
|
1201
|
2> $data
|
1202
|
1202
|
fi
|
1203
|
1203
|
sel=$?
|
|
@@ -1211,13 +1211,13 @@ function interactive_configuration {
|
1211
|
1211
|
validate_domain_name
|
1212
|
1212
|
if [[ $TEST_DOMAIN_NAME != $OWNCLOUD_DOMAIN_NAME ]]; then
|
1213
|
1213
|
OWNCLOUD_DOMAIN_NAME=
|
1214
|
|
- dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1214
|
+ dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
1215
|
1215
|
else
|
1216
|
1216
|
if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1217
|
1217
|
OWNCLOUD_CODE=$(cat $data | sed -n 2p)
|
1218
|
1218
|
if [ ${#OWNCLOUD_CODE} -lt 30 ]; then
|
1219
|
1219
|
OWNCLOUD_DOMAIN_NAME=
|
1220
|
|
- dialog --title "FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1220
|
+ dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
1221
|
1221
|
fi
|
1222
|
1222
|
fi
|
1223
|
1223
|
fi
|
|
@@ -1236,17 +1236,17 @@ function interactive_configuration {
|
1236
|
1236
|
data=$(tempfile 2>/dev/null)
|
1237
|
1237
|
trap "rm -f $data" 0 1 2 5 15
|
1238
|
1238
|
if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1239
|
|
- dialog --backtitle "Freedombone Configuration" \
|
1240
|
|
- --title "Hubzilla Configuration" \
|
1241
|
|
- --form "\nPlease enter your Hubzilla details:" 11 55 3 \
|
1242
|
|
- "Domain:" 1 1 "$(grep 'HUBZILLA_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
1243
|
|
- "Code:" 2 1 "$(grep 'HUBZILLA_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
|
1239
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1240
|
+ --title $"Hubzilla Configuration" \
|
|
1241
|
+ --form $"\nPlease enter your Hubzilla details:" 11 55 3 \
|
|
1242
|
+ $"Domain:" 1 1 "$(grep 'HUBZILLA_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
|
1243
|
+ $"Code:" 2 1 "$(grep 'HUBZILLA_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
1244
|
1244
|
2> $data
|
1245
|
1245
|
else
|
1246
|
|
- dialog --backtitle "Freedombone Configuration" \
|
1247
|
|
- --title "Hubzilla Configuration" \
|
1248
|
|
- --form "\nPlease enter your Hubzilla details:" 11 55 3 \
|
1249
|
|
- "Domain:" 1 1 "$(grep 'HUBZILLA_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
|
1246
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1247
|
+ --title $"Hubzilla Configuration" \
|
|
1248
|
+ --form $"\nPlease enter your Hubzilla details:" 11 55 3 \
|
|
1249
|
+ $"Domain:" 1 1 "$(grep 'HUBZILLA_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
1250
|
1250
|
2> $data
|
1251
|
1251
|
fi
|
1252
|
1252
|
sel=$?
|
|
@@ -1260,13 +1260,13 @@ function interactive_configuration {
|
1260
|
1260
|
validate_domain_name
|
1261
|
1261
|
if [[ $TEST_DOMAIN_NAME != $HUBZILLA_DOMAIN_NAME ]]; then
|
1262
|
1262
|
HUBZILLA_DOMAIN_NAME=
|
1263
|
|
- dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1263
|
+ dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
1264
|
1264
|
else
|
1265
|
1265
|
if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1266
|
1266
|
HUBZILLA_CODE=$(cat $data | sed -n 2p)
|
1267
|
1267
|
if [ ${#HUBZILLA_CODE} -lt 30 ]; then
|
1268
|
1268
|
HUBZILLA_DOMAIN_NAME=
|
1269
|
|
- dialog --title "FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1269
|
+ dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
1270
|
1270
|
fi
|
1271
|
1271
|
fi
|
1272
|
1272
|
fi
|
|
@@ -1285,17 +1285,17 @@ function interactive_configuration {
|
1285
|
1285
|
data=$(tempfile 2>/dev/null)
|
1286
|
1286
|
trap "rm -f $data" 0 1 2 5 15
|
1287
|
1287
|
if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1288
|
|
- dialog --backtitle "Freedombone Configuration" \
|
1289
|
|
- --title "Microblog Configuration" \
|
1290
|
|
- --form "\nPlease enter your Microblog details:" 11 55 3 \
|
1291
|
|
- "Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
1292
|
|
- "Code:" 2 1 "$(grep 'MICROBLOG_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
|
1288
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1289
|
+ --title $"Microblog Configuration" \
|
|
1290
|
+ --form $"\nPlease enter your Microblog details:" 11 55 3 \
|
|
1291
|
+ $"Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
|
1292
|
+ $"Code:" 2 1 "$(grep 'MICROBLOG_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
1293
|
1293
|
2> $data
|
1294
|
1294
|
else
|
1295
|
|
- dialog --backtitle "Freedombone Configuration" \
|
1296
|
|
- --title "Microblog Configuration" \
|
1297
|
|
- --form "\nPlease enter your Microblog details:" 11 55 3 \
|
1298
|
|
- "Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
|
1295
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1296
|
+ --title $"Microblog Configuration" \
|
|
1297
|
+ --form $"\nPlease enter your Microblog details:" 11 55 3 \
|
|
1298
|
+ $"Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
1299
|
1299
|
2> $data
|
1300
|
1300
|
fi
|
1301
|
1301
|
sel=$?
|
|
@@ -1312,13 +1312,13 @@ function interactive_configuration {
|
1312
|
1312
|
validate_domain_name
|
1313
|
1313
|
if [[ $TEST_DOMAIN_NAME != $MICROBLOG_DOMAIN_NAME ]]; then
|
1314
|
1314
|
MICROBLOG_DOMAIN_NAME=
|
1315
|
|
- dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1315
|
+ dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
1316
|
1316
|
else
|
1317
|
1317
|
if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1318
|
1318
|
MICROBLOG_CODE=$(cat $data | sed -n 2p)
|
1319
|
1319
|
if [ ${#MICROBLOG_CODE} -lt 30 ]; then
|
1320
|
1320
|
MICROBLOG_DOMAIN_NAME=
|
1321
|
|
- dialog --title "FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1321
|
+ dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
1322
|
1322
|
fi
|
1323
|
1323
|
fi
|
1324
|
1324
|
fi
|
|
@@ -1338,17 +1338,17 @@ function interactive_configuration {
|
1338
|
1338
|
trap "rm -f $data" 0 1 2 5 15
|
1339
|
1339
|
|
1340
|
1340
|
if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1341
|
|
- dialog --backtitle "Freedombone Configuration" \
|
1342
|
|
- --title "Developer Configuration" \
|
1343
|
|
- --form "\nPlease enter your Git hosting site details.\nIf You don't need developer tools then just select Ok" 11 55 3 \
|
1344
|
|
- "Domain:" 1 1 "$(grep 'GIT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
|
1345
|
|
- "Code:" 2 1 "$(grep 'GIT_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 40 \
|
|
1341
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1342
|
+ --title $"Developer Configuration" \
|
|
1343
|
+ --form $"\nPlease enter your Git hosting site details.\nIf You don't need developer tools then just select Ok" 11 55 3 \
|
|
1344
|
+ $"Domain:" 1 1 "$(grep 'GIT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
|
|
1345
|
+ $"Code:" 2 1 "$(grep 'GIT_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 40 \
|
1346
|
1346
|
2> $data
|
1347
|
1347
|
else
|
1348
|
|
- dialog --backtitle "Freedombone Configuration" \
|
1349
|
|
- --title "Developer Configuration" \
|
1350
|
|
- --form "\nPlease enter your Git hosting site details.\nIf You don't need developer tools then just select Ok" 11 55 2 \
|
1351
|
|
- "Domain:" 1 1 "$(grep 'GIT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
|
|
1348
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1349
|
+ --title $"Developer Configuration" \
|
|
1350
|
+ --form $"\nPlease enter your Git hosting site details.\nIf You don't need developer tools then just select Ok" 11 55 2 \
|
|
1351
|
+ $"Domain:" 1 1 "$(grep 'GIT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
|
1352
|
1352
|
2> $data
|
1353
|
1353
|
fi
|
1354
|
1354
|
sel=$?
|
|
@@ -1362,13 +1362,13 @@ function interactive_configuration {
|
1362
|
1362
|
validate_domain_name
|
1363
|
1363
|
if [[ $TEST_DOMAIN_NAME != $GIT_DOMAIN_NAME ]]; then
|
1364
|
1364
|
GIT_DOMAIN_NAME=
|
1365
|
|
- dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1365
|
+ dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
1366
|
1366
|
else
|
1367
|
1367
|
if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1368
|
1368
|
GIT_CODE=$(cat $data | sed -n 2p)
|
1369
|
1369
|
if [ ${#GIT_CODE} -lt 30 ]; then
|
1370
|
1370
|
GIT_DOMAIN_NAME=
|
1371
|
|
- dialog --title "FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1371
|
+ dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
1372
|
1372
|
fi
|
1373
|
1373
|
fi
|
1374
|
1374
|
fi
|
|
@@ -1389,11 +1389,11 @@ function interactive_configuration {
|
1389
|
1389
|
data=$(tempfile 2>/dev/null)
|
1390
|
1390
|
trap "rm -f $data" 0 1 2 5 15
|
1391
|
1391
|
if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
|
1392
|
|
- dialog --backtitle "Freedombone Configuration" \
|
1393
|
|
- --title "Default Domain" \
|
1394
|
|
- --form "\nWhich domain name should your email/XMPP/IRC/VoIP be associated with?" 11 55 3 \
|
1395
|
|
- "Domain:" 1 1 "$(grep 'DEFAULT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
1396
|
|
- "Code:" 2 1 "$(grep 'DEFAULT_DOMAIN_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
|
1392
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1393
|
+ --title $"Default Domain" \
|
|
1394
|
+ --form $"\nWhich domain name should your email/XMPP/IRC/VoIP be associated with?" 11 55 3 \
|
|
1395
|
+ $"Domain:" 1 1 "$(grep 'DEFAULT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
|
|
1396
|
+ $"Code:" 2 1 "$(grep 'DEFAULT_DOMAIN_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
|
1397
|
1397
|
2> $data
|
1398
|
1398
|
sel=$?
|
1399
|
1399
|
case $sel in
|
|
@@ -1405,12 +1405,12 @@ function interactive_configuration {
|
1405
|
1405
|
if [ $DEFAULT_DOMAIN_NAME ]; then
|
1406
|
1406
|
if [ ${#DEFAULT_DOMAIN_CODE} -lt 30 ]; then
|
1407
|
1407
|
DEFAULT_DOMAIN_NAME=
|
1408
|
|
- dialog --title "FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
|
1408
|
+ dialog --title $"FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
|
1409
|
1409
|
fi
|
1410
|
1410
|
fi
|
1411
|
1411
|
else
|
1412
|
|
- dialog --backtitle "Freedombone Configuration" \
|
1413
|
|
- --inputbox "Which domain name should your email/XMPP/IRC/VoIP be associated with?" 10 45 \
|
|
1412
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1413
|
+ --inputbox $"Which domain name should your email/XMPP/IRC/VoIP be associated with?" 10 45 \
|
1414
|
1414
|
"$(grep 'DEFAULT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
|
1415
|
1415
|
sel=$?
|
1416
|
1416
|
case $sel in
|
|
@@ -1424,7 +1424,7 @@ function interactive_configuration {
|
1424
|
1424
|
validate_domain_name
|
1425
|
1425
|
if [[ $TEST_DOMAIN_NAME != $DEFAULT_DOMAIN_NAME ]]; then
|
1426
|
1426
|
DEFAULT_DOMAIN_NAME=
|
1427
|
|
- dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
|
1427
|
+ dialog --title $"Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
|
1428
|
1428
|
else
|
1429
|
1429
|
DEFAULT_DOMAIN_DETAILS_COMPLETE="yes"
|
1430
|
1430
|
fi
|
|
@@ -1444,8 +1444,8 @@ function interactive_configuration {
|
1444
|
1444
|
|
1445
|
1445
|
data=$(tempfile 2>/dev/null)
|
1446
|
1446
|
trap "rm -f $data" 0 1 2 5 15
|
1447
|
|
- dialog --backtitle "Freedombone Configuration" \
|
1448
|
|
- --inputbox "Your email address" 10 30 "$EMAIL_ADDRESS" 2> $data
|
|
1447
|
+ dialog --backtitle $"Freedombone Configuration" \
|
|
1448
|
+ --inputbox $"Your email address" 10 30 "$EMAIL_ADDRESS" 2> $data
|
1449
|
1449
|
sel=$?
|
1450
|
1450
|
case $sel in
|
1451
|
1451
|
0) MY_EMAIL_ADDRESS=$(cat $data);;
|
|
@@ -1465,9 +1465,10 @@ function interactive_configuration {
|
1465
|
1465
|
function show_result {
|
1466
|
1466
|
clear
|
1467
|
1467
|
echo ''
|
1468
|
|
- echo "Configuration filename: $CONFIGURATION_FILE"
|
|
1468
|
+ echo -n $"Configuration filename:"
|
|
1469
|
+ echo " $CONFIGURATION_FILE"
|
1469
|
1470
|
echo ''
|
1470
|
|
- echo 'Contents:'
|
|
1471
|
+ echo $'Contents:'
|
1471
|
1472
|
echo ''
|
1472
|
1473
|
cat $CONFIGURATION_FILE
|
1473
|
1474
|
echo ''
|