浏览代码

full system type

Bob Mottram 10 年前
父节点
当前提交
862c77a214
共有 1 个文件被更改,包括 6 次插入2 次删除
  1. 6
    2
      src/freedombone

+ 6
- 2
src/freedombone 查看文件

@@ -1146,7 +1146,11 @@ function parse_args {
1146 1146
           exit 4
1147 1147
       fi
1148 1148
   fi
1149
-  if [[ $SYSTEM_TYPE != $VARIANT_WRITER && $SYSTEM_TYPE != $VARIANT_CLOUD && $SYSTEM_TYPE != $VARIANT_CHAT && $SYSTEM_TYPE != $VARIANT_MAILBOX && $SYSTEM_TYPE != $VARIANT_NONMAILBOX && $SYSTEM_TYPE != $VARIANT_SOCIAL && $SYSTEM_TYPE != $VARIANT_MEDIA && $SYSTEM_TYPE != $VARIANT_TOR_DONGLE ]]; then
1149
+  if [ ! $SYSTEM_TYPE ]; then
1150
+      SYSTEM_TYPE=$VARIANT_FULL
1151
+  fi
1152
+  echo "System: $SYSTEM_TYPE"
1153
+  if [[ $SYSTEM_TYPE != $VARIANT_WRITER && $SYSTEM_TYPE != $VARIANT_CLOUD && $SYSTEM_TYPE != $VARIANT_CHAT && $SYSTEM_TYPE != $VARIANT_MAILBOX && $SYSTEM_TYPE != $VARIANT_NONMAILBOX && $SYSTEM_TYPE != $VARIANT_SOCIAL && $SYSTEM_TYPE != $VARIANT_MEDIA && $SYSTEM_TYPE != $VARIANT_TOR_DONGLE && $SYSTEM_TYPE != $VARIANT_FULL ]]; then
1150 1154
       echo "'$SYSTEM_TYPE' is an unrecognised Freedombone variant."
1151 1155
       exit 30
1152 1156
   fi
@@ -6689,7 +6693,7 @@ function install_wiki {
6689 6693
       return
6690 6694
   fi
6691 6695
   # if everything is being installed or if this is exclusively a writer setup
6692
-  if [[ ! $SYSTEM_TYPE || $SYSTEM_TYPE == "$VARIANT_WRITER" ]]; then
6696
+  if [[ $SYSTEM_TYPE == "$VARIANT_FULL" || $SYSTEM_TYPE == "$VARIANT_WRITER" ]]; then
6693 6697
       WIKI_DOMAIN_NAME=$DOMAIN_NAME
6694 6698
       WIKI_FREEDNS_SUBDOMAIN_CODE=$FREEDNS_SUBDOMAIN_CODE
6695 6699
   fi