free
/
freedombonee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Customising interactive installer for the mesh variant

This commit is contained in:
Bob Mottram 2015-07-19 14:59:00 +01:00
parent 32c290857e
commit 50b2b7860c
1 changed files with 157 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/freedombone-config
View File

@ -562,6 +562,7 @@ function interactive_configuration {
fi fi
save_configuration_file save_configuration_file
if [[ SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
interactive_gpg interactive_gpg
data=$(tempfile 2>/dev/null) data=$(tempfile 2>/dev/null)
@ -583,6 +584,7 @@ function interactive_configuration {
255) exit 1;; 255) exit 1;;
esac esac
save_configuration_file save_configuration_file
fi
data=$(tempfile 2>/dev/null) data=$(tempfile 2>/dev/null)
trap "rm -f $data" 0 1 2 5 15 trap "rm -f $data" 0 1 2 5 15
@ -804,6 +806,8 @@ function interactive_configuration {
esac esac
save_configuration_file save_configuration_file
if [[ SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
data=$(tempfile 2>/dev/null) data=$(tempfile 2>/dev/null)
trap "rm -f $data" 0 1 2 5 15 trap "rm -f $data" 0 1 2 5 15
dialog --backtitle "Freedombone Configuration" \ dialog --backtitle "Freedombone Configuration" \
@ -881,6 +885,7 @@ function interactive_configuration {
fi fi
done done
save_configuration_file save_configuration_file
fi
while [ ! $MY_NAME ] while [ ! $MY_NAME ]
do do
@ -1236,6 +1241,7 @@ function interactive_configuration {
save_configuration_file save_configuration_file
fi fi
if [[ SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
DEFAULT_DOMAIN_DETAILS_COMPLETE= DEFAULT_DOMAIN_DETAILS_COMPLETE=
while [ ! $DEFAULT_DOMAIN_DETAILS_COMPLETE ] while [ ! $DEFAULT_DOMAIN_DETAILS_COMPLETE ]
do do
@ -1306,8 +1312,8 @@ function interactive_configuration {
255) exit 1;; 255) exit 1;;
esac esac
done done
save_configuration_file save_configuration_file
fi
# delete the temporary configuration file # delete the temporary configuration file
if [ -f temp.cfg ]; then if [ -f temp.cfg ]; then