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

Fixing minor bugs

This commit is contained in:
Bob Mottram 2016-02-19 17:18:03 +00:00
parent e6b7addca3
commit fa4bc831c5
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/freedombone
View File

@ -1417,22 +1417,22 @@ function set_default_onion_domains {
return return
fi fi
if [ $OWNCLOUD_DOMAIN_NAME ]; then if [ ${#OWNCLOUD_DOMAIN_NAME} -gt 1 ]; then
OWNCLOUD_DOMAIN_NAME='owncloud.local' OWNCLOUD_DOMAIN_NAME='owncloud.local'
fi fi
if [ $MICROBLOG_DOMAIN_NAME ]; then if [ ${#MICROBLOG_DOMAIN_NAME} -gt 1 ]; then
MICROBLOG_DOMAIN_NAME='microblog.local' MICROBLOG_DOMAIN_NAME='microblog.local'
fi fi
if [ $FULLBLOG_DOMAIN_NAME ]; then if [ ${#FULLBLOG_DOMAIN_NAME} -gt 1 ]; then
FULLBLOG_DOMAIN_NAME='blog.local' FULLBLOG_DOMAIN_NAME='blog.local'
fi fi
if [ $WIKI_DOMAIN_NAME ]; then if [ ${#WIKI_DOMAIN_NAME} -gt 1 ]; then
WIKI_DOMAIN_NAME='wiki.local' WIKI_DOMAIN_NAME='wiki.local'
fi fi
if [ $DEFAULT_DOMAIN_NAME ]; then if [ ${#DEFAULT_DOMAIN_NAME} -gt 1 ]; then
DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.local" DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.local"
fi fi
if [ $GIT_DOMAIN_NAME ]; then if [ ${#GIT_DOMAIN_NAME} -gt 1 ]; then
GIT_DOMAIN_NAME='git.local' GIT_DOMAIN_NAME='git.local'
fi fi
} }
@ -1652,7 +1652,7 @@ function test_domain_name {
# check that domain names are sensible # check that domain names are sensible
function check_domains { function check_domains {
if [ $WIKI_DOMAIN_NAME ]; then if [ ${#WIKI_DOMAIN_NAME} -gt 1 ]; then
test_domain_name "$WIKI_DOMAIN_NAME" test_domain_name "$WIKI_DOMAIN_NAME"
if [[ "$test_domain_name" == "$OWNCLOUD_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$OWNCLOUD_DOMAIN_NAME" ]]; then
@ -1671,7 +1671,7 @@ function check_domains {
echo $'Wiki domain name is the same as hubzilla domain name. They must be different' echo $'Wiki domain name is the same as hubzilla domain name. They must be different'
exit 65848 exit 65848
fi fi
if [ $GIT_DOMAIN_NAME ]; then if [ ${#GIT_DOMAIN_NAME} -gt 1 ]; then
if [[ "$test_domain_name" == "$GIT_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$GIT_DOMAIN_NAME" ]]; then
echo $'Wiki domain name is the same as Gogs domain name. They must be different' echo $'Wiki domain name is the same as Gogs domain name. They must be different'
exit 73529 exit 73529
@ -1679,7 +1679,7 @@ function check_domains {
fi fi
fi fi
if [ $OWNCLOUD_DOMAIN_NAME ]; then if [ ${#OWNCLOUD_DOMAIN_NAME} -gt 1 ]; then
test_domain_name "$OWNCLOUD_DOMAIN_NAME" test_domain_name "$OWNCLOUD_DOMAIN_NAME"
if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
@ -1706,7 +1706,7 @@ function check_domains {
fi fi
fi fi
if [ $FULLBLOG_DOMAIN_NAME ]; then if [ ${#FULLBLOG_DOMAIN_NAME} -gt 1 ]; then
test_domain_name "$FULLBLOG_DOMAIN_NAME" test_domain_name "$FULLBLOG_DOMAIN_NAME"
if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
@ -1733,7 +1733,7 @@ function check_domains {
fi fi
fi fi
if [ $MICROBLOG_DOMAIN_NAME ]; then if [ ${#MICROBLOG_DOMAIN_NAME} -gt 1 ]; then
test_domain_name "$MICROBLOG_DOMAIN_NAME" test_domain_name "$MICROBLOG_DOMAIN_NAME"
if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
@ -1779,7 +1779,7 @@ function check_domains {
echo $'Hubzilla domain name is the same as microblog domain name. They must be different' echo $'Hubzilla domain name is the same as microblog domain name. They must be different'
exit 83683 exit 83683
fi fi
if [ $GIT_DOMAIN_NAME ]; then if [ ${#GIT_DOMAIN_NAME} -gt 1 ]; then
if [[ "$test_domain_name" == "$GIT_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$GIT_DOMAIN_NAME" ]]; then
echo $'Hubzilla domain name is the same as Gogs domain name. They must be different' echo $'Hubzilla domain name is the same as Gogs domain name. They must be different'
exit 135523 exit 135523
@ -1787,7 +1787,7 @@ function check_domains {
fi fi
fi fi
if [ $GIT_DOMAIN_NAME ]; then if [ ${#GIT_DOMAIN_NAME} -gt 1 ]; then
test_domain_name "$GIT_DOMAIN_NAME" test_domain_name "$GIT_DOMAIN_NAME"
if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then