ソースを参照

Clash between function names

Bob Mottram 8 年 前
コミット
94948257b1
共有2 個のファイルを変更した6 個の追加6 個の削除を含む
  1. 4
    4
      src/freedombone-addremove
  2. 2
    2
      src/freedombone-config

+ 4
- 4
src/freedombone-addremove ファイルの表示

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

+ 2
- 2
src/freedombone-config ファイルの表示

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