Browse Source

Clash between function names

Bob Mottram 8 years ago
parent
commit
94948257b1
2 changed files with 6 additions and 6 deletions
  1. 4
    4
      src/freedombone-addremove
  2. 2
    2
      src/freedombone-config

+ 4
- 4
src/freedombone-addremove View File

@@ -86,7 +86,7 @@ function show_apps {
86 86
     fi
87 87
 }
88 88
 
89
-function remove_apps_interactive {
89
+function remove_apps_selected {
90 90
     # which apps need to be removed?
91 91
     removals=""
92 92
     app_index=0
@@ -129,7 +129,7 @@ function remove_apps_interactive {
129 129
     remove_apps
130 130
 }
131 131
 
132
-function install_apps_interactive {
132
+function install_apps_selected {
133 133
     # which apps need to be installed?
134 134
     installs=""
135 135
     app_index=0
@@ -190,7 +190,7 @@ show_apps
190 190
 
191 191
 clear
192 192
 
193
-remove_apps_interactive
194
-install_apps_interactive
193
+remove_apps_selected
194
+install_apps_selected
195 195
 
196 196
 exit 0

+ 2
- 2
src/freedombone-config View File

@@ -52,7 +52,7 @@ MY_USERNAME=
52 52
 DEFAULT_DOMAIN_NAME=
53 53
 DEFAULT_DOMAIN_CODE=
54 54
 MY_EMAIL_ADDRESS=
55
-SYSTEM_TYPE=
55
+SYSTEM_TYPE='full'
56 56
 INSTALLING_ON_BBB="no"
57 57
 DDNS_PROVIDER=
58 58
 DDNS_USERNAME=
@@ -1331,7 +1331,7 @@ function interactive_config {
1331 1331
 
1332 1332
     dialog --title $"Freedombone" --msgbox "$INITIAL_MESSAGE" 15 50
1333 1333
 
1334
-    choose_system_variant
1334
+    #choose_system_variant
1335 1335
     set_main_repo
1336 1336
     choose_username
1337 1337
     choose_full_name