浏览代码

Different method of interactive install allows the user to select apps from a list

Bob Mottram 8 年前
父节点
当前提交
3d259de720
共有 3 个文件被更改,包括 11 次插入15 次删除
  1. 1
    1
      src/freedombone
  2. 0
    12
      src/freedombone-config
  3. 10
    2
      src/freedombone-utils-setup

+ 1
- 1
src/freedombone 查看文件

300
 setup_utils
300
 setup_utils
301
 setup_email
301
 setup_email
302
 setup_web
302
 setup_web
303
-setup_apps
303
+setup_apps $command_options
304
 setup_final
304
 setup_final
305
 
305
 
306
 echo "${PROJECT_NAME} installation is complete"
306
 echo "${PROJECT_NAME} installation is complete"

+ 0
- 12
src/freedombone-config 查看文件

1346
     choose_default_domain_name
1346
     choose_default_domain_name
1347
     choose_email_address
1347
     choose_email_address
1348
 
1348
 
1349
-    function_check create_completion_file
1350
-    create_completion_file
1351
-
1352
-    function_ckeck detect_installable_apps
1353
-    detect_installable_apps
1354
-
1355
-    function_check choose_apps_for_variant
1356
-    choose_apps_for_variant "$SYSTEM_TYPE"
1357
-
1358
-    function_check install_apps_interactive
1359
-    install_apps_interactive
1360
-
1361
     # delete the temporary configuration file
1349
     # delete the temporary configuration file
1362
     if [ -f temp.cfg ]; then
1350
     if [ -f temp.cfg ]; then
1363
         shred -zu temp.cfg
1351
         shred -zu temp.cfg

+ 10
- 2
src/freedombone-utils-setup 查看文件

513
 }
513
 }
514
 
514
 
515
 function setup_apps {
515
 function setup_apps {
516
+    is_interactive=$1
517
+
516
     function_check create_completion_file
518
     function_check create_completion_file
517
     create_completion_file
519
     create_completion_file
518
 
520
 
532
     function_check upgrade_apps
534
     function_check upgrade_apps
533
     upgrade_apps
535
     upgrade_apps
534
 
536
 
535
-    function_check install_apps
536
-    install_apps
537
+    if [[ $is_interactive == "menuconfig"* ]]; then
538
+        ${PROJECT_NAME}-addremove
539
+    fi
540
+
541
+    if [[ $is_interactive == "noninteractive" || $is_interactive == "headless" ]]; then
542
+        function_check install_apps
543
+        install_apps
544
+    fi
537
 }
545
 }
538
 
546
 
539
 function combine_all_scripts {
547
 function combine_all_scripts {