More generic

This commit is contained in:
Bob Mottram 2016-01-25 17:16:51 +00:00
parent 93a593e327
commit 3f7702f4b3
1 changed files with 10 additions and 10 deletions

View File

@ -41,13 +41,13 @@ DEFAULT_LANGUAGE=$(echo $LANG)
GENERIC_IMAGE_USERNAME='fbone' GENERIC_IMAGE_USERNAME='fbone'
# Web site # Web site
FREEDOMBONE_WEBSITE="http://${PROJECT_NAME}.uk.to" PROJECT_WEBSITE="http://${PROJECT_NAME}.uk.to"
# Repo # Repo
FREEDOMBONE_REPO="https://github.com/bashrc/${PROJECT_NAME}" PROJECT_REPO="https://github.com/bashrc/${PROJECT_NAME}"
# Contact details # Contact details
FREEDOMBONE_BITMESSAGE="BM-2cWuhmBvVdfrHhLoZTdspCkKeiTorUesSL" PROJECT_BITMESSAGE="BM-2cWuhmBvVdfrHhLoZTdspCkKeiTorUesSL"
# Are we installing on a Beaglebone Black (BBB) or some other system? # Are we installing on a Beaglebone Black (BBB) or some other system?
INSTALLING_ON_BBB="no" INSTALLING_ON_BBB="no"
@ -611,22 +611,22 @@ function interactive_configuration {
if [[ $MINIMAL_INSTALL == "no" ]]; then if [[ $MINIMAL_INSTALL == "no" ]]; then
${PROJECT_NAME}-config \ ${PROJECT_NAME}-config \
-f $CONFIGURATION_FILE \ -f $CONFIGURATION_FILE \
-w $FREEDOMBONE_WEBSITE \ -w $PROJECT_WEBSITE \
-b $FREEDOMBONE_BITMESSAGE \ -b $PROJECT_BITMESSAGE \
-m $MINIMUM_PASSWORD_LENGTH -m $MINIMUM_PASSWORD_LENGTH
else else
${PROJECT_NAME}-config \ ${PROJECT_NAME}-config \
-f $CONFIGURATION_FILE \ -f $CONFIGURATION_FILE \
-w $FREEDOMBONE_WEBSITE \ -w $PROJECT_WEBSITE \
-b $FREEDOMBONE_BITMESSAGE \ -b $PROJECT_BITMESSAGE \
-m $MINIMUM_PASSWORD_LENGTH \ -m $MINIMUM_PASSWORD_LENGTH \
--minimal "yes" --minimal "yes"
fi fi
else else
${PROJECT_NAME}-config \ ${PROJECT_NAME}-config \
-f $CONFIGURATION_FILE \ -f $CONFIGURATION_FILE \
-w $FREEDOMBONE_WEBSITE \ -w $PROJECT_WEBSITE \
-b $FREEDOMBONE_BITMESSAGE \ -b $PROJECT_BITMESSAGE \
-m $MINIMUM_PASSWORD_LENGTH \ -m $MINIMUM_PASSWORD_LENGTH \
--onion "yes" --onion "yes"
fi fi
@ -638,7 +638,7 @@ function interactive_configuration {
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
echo $'Command failed:' echo $'Command failed:'
echo '' echo ''
echo $" ${PROJECT_NAME}-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $FREEDOMBONE_WEBSITE -b $FREEDOMBONE_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]" echo $" ${PROJECT_NAME}-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $PROJECT_WEBSITE -b $PROJECT_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]"
echo '' echo ''
exit 73594 exit 73594
fi fi