瀏覽代碼

Fixing minor bugs

Bob Mottram 9 年之前
父節點
當前提交
fa4bc831c5
共有 1 個文件被更改,包括 13 次插入13 次删除
  1. 13
    13
      src/freedombone

+ 13
- 13
src/freedombone 查看文件

1417
         return
1417
         return
1418
     fi
1418
     fi
1419
 
1419
 
1420
-    if [ $OWNCLOUD_DOMAIN_NAME ]; then
1420
+    if [ ${#OWNCLOUD_DOMAIN_NAME} -gt 1 ]; then
1421
         OWNCLOUD_DOMAIN_NAME='owncloud.local'
1421
         OWNCLOUD_DOMAIN_NAME='owncloud.local'
1422
     fi
1422
     fi
1423
-    if [ $MICROBLOG_DOMAIN_NAME ]; then
1423
+    if [ ${#MICROBLOG_DOMAIN_NAME} -gt 1 ]; then
1424
         MICROBLOG_DOMAIN_NAME='microblog.local'
1424
         MICROBLOG_DOMAIN_NAME='microblog.local'
1425
     fi
1425
     fi
1426
-    if [ $FULLBLOG_DOMAIN_NAME ]; then
1426
+    if [ ${#FULLBLOG_DOMAIN_NAME} -gt 1 ]; then
1427
         FULLBLOG_DOMAIN_NAME='blog.local'
1427
         FULLBLOG_DOMAIN_NAME='blog.local'
1428
     fi
1428
     fi
1429
-    if [ $WIKI_DOMAIN_NAME ]; then
1429
+    if [ ${#WIKI_DOMAIN_NAME} -gt 1 ]; then
1430
         WIKI_DOMAIN_NAME='wiki.local'
1430
         WIKI_DOMAIN_NAME='wiki.local'
1431
     fi
1431
     fi
1432
-    if [ $DEFAULT_DOMAIN_NAME ]; then
1432
+    if [ ${#DEFAULT_DOMAIN_NAME} -gt 1 ]; then
1433
         DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.local"
1433
         DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.local"
1434
     fi
1434
     fi
1435
-    if [ $GIT_DOMAIN_NAME ]; then
1435
+    if [ ${#GIT_DOMAIN_NAME} -gt 1 ]; then
1436
         GIT_DOMAIN_NAME='git.local'
1436
         GIT_DOMAIN_NAME='git.local'
1437
     fi
1437
     fi
1438
 }
1438
 }
1652
 
1652
 
1653
 # check that domain names are sensible
1653
 # check that domain names are sensible
1654
 function check_domains {
1654
 function check_domains {
1655
-    if [ $WIKI_DOMAIN_NAME ]; then
1655
+    if [ ${#WIKI_DOMAIN_NAME} -gt 1 ]; then
1656
         test_domain_name "$WIKI_DOMAIN_NAME"
1656
         test_domain_name "$WIKI_DOMAIN_NAME"
1657
 
1657
 
1658
         if [[ "$test_domain_name" == "$OWNCLOUD_DOMAIN_NAME" ]]; then
1658
         if [[ "$test_domain_name" == "$OWNCLOUD_DOMAIN_NAME" ]]; then
1671
             echo $'Wiki domain name is the same as hubzilla domain name. They must be different'
1671
             echo $'Wiki domain name is the same as hubzilla domain name. They must be different'
1672
             exit 65848
1672
             exit 65848
1673
         fi
1673
         fi
1674
-        if [ $GIT_DOMAIN_NAME ]; then
1674
+        if [ ${#GIT_DOMAIN_NAME} -gt 1 ]; then
1675
             if [[ "$test_domain_name" == "$GIT_DOMAIN_NAME" ]]; then
1675
             if [[ "$test_domain_name" == "$GIT_DOMAIN_NAME" ]]; then
1676
                 echo $'Wiki domain name is the same as Gogs domain name. They must be different'
1676
                 echo $'Wiki domain name is the same as Gogs domain name. They must be different'
1677
                 exit 73529
1677
                 exit 73529
1679
         fi
1679
         fi
1680
     fi
1680
     fi
1681
 
1681
 
1682
-    if [ $OWNCLOUD_DOMAIN_NAME ]; then
1682
+    if [ ${#OWNCLOUD_DOMAIN_NAME} -gt 1 ]; then
1683
         test_domain_name "$OWNCLOUD_DOMAIN_NAME"
1683
         test_domain_name "$OWNCLOUD_DOMAIN_NAME"
1684
 
1684
 
1685
         if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
1685
         if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
1706
         fi
1706
         fi
1707
     fi
1707
     fi
1708
 
1708
 
1709
-    if [ $FULLBLOG_DOMAIN_NAME ]; then
1709
+    if [ ${#FULLBLOG_DOMAIN_NAME} -gt 1 ]; then
1710
         test_domain_name "$FULLBLOG_DOMAIN_NAME"
1710
         test_domain_name "$FULLBLOG_DOMAIN_NAME"
1711
 
1711
 
1712
         if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
1712
         if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
1733
         fi
1733
         fi
1734
     fi
1734
     fi
1735
 
1735
 
1736
-    if [ $MICROBLOG_DOMAIN_NAME ]; then
1736
+    if [ ${#MICROBLOG_DOMAIN_NAME} -gt 1 ]; then
1737
         test_domain_name "$MICROBLOG_DOMAIN_NAME"
1737
         test_domain_name "$MICROBLOG_DOMAIN_NAME"
1738
 
1738
 
1739
         if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
1739
         if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
1779
             echo $'Hubzilla domain name is the same as microblog domain name. They must be different'
1779
             echo $'Hubzilla domain name is the same as microblog domain name. They must be different'
1780
             exit 83683
1780
             exit 83683
1781
         fi
1781
         fi
1782
-        if [ $GIT_DOMAIN_NAME ]; then
1782
+        if [ ${#GIT_DOMAIN_NAME} -gt 1 ]; then
1783
             if [[ "$test_domain_name" == "$GIT_DOMAIN_NAME" ]]; then
1783
             if [[ "$test_domain_name" == "$GIT_DOMAIN_NAME" ]]; then
1784
                 echo $'Hubzilla domain name is the same as Gogs domain name. They must be different'
1784
                 echo $'Hubzilla domain name is the same as Gogs domain name. They must be different'
1785
                 exit 135523
1785
                 exit 135523
1787
         fi
1787
         fi
1788
     fi
1788
     fi
1789
 
1789
 
1790
-    if [ $GIT_DOMAIN_NAME ]; then
1790
+    if [ ${#GIT_DOMAIN_NAME} -gt 1 ]; then
1791
         test_domain_name "$GIT_DOMAIN_NAME"
1791
         test_domain_name "$GIT_DOMAIN_NAME"
1792
 
1792
 
1793
         if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
1793
         if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then