Bladeren bron

Check that all chosen apps actually do get installed

Bob Mottram 8 jaren geleden
bovenliggende
commit
d925c4f00d
3 gewijzigde bestanden met toevoegingen van 15 en 0 verwijderingen
  1. 4
    0
      src/freedombone-addremove
  2. 4
    0
      src/freedombone-utils-selector
  3. 7
    0
      src/freedombone-utils-setup

+ 4
- 0
src/freedombone-addremove Bestand weergeven

174
     # install the apps
174
     # install the apps
175
     read_configuration
175
     read_configuration
176
     install_apps interactive
176
     install_apps interactive
177
+    if [ ! $APP_INSTALLED_SUCCESS ]; then
178
+        echo $'One or more apps failed to install'
179
+        exit 357223
180
+    fi
177
 }
181
 }
178
 
182
 
179
 if [[ $1 == "test"* ]]; then
183
 if [[ $1 == "test"* ]]; then

+ 4
- 0
src/freedombone-utils-selector Bestand weergeven

426
 function install_apps {
426
 function install_apps {
427
     is_interactive=$1
427
     is_interactive=$1
428
 
428
 
429
+    APP_INSTALLED_SUCCESS=1
430
+
429
     # interactive install configuration for each app
431
     # interactive install configuration for each app
430
     if [ ${is_interactive} ]; then
432
     if [ ${is_interactive} ]; then
431
         install_apps_interactive
433
         install_apps_interactive
461
                             install_completed ${a}
463
                             install_completed ${a}
462
                             echo $"${a} was installed from interactive"
464
                             echo $"${a} was installed from interactive"
463
                         else
465
                         else
466
+                            APP_INSTALLED_SUCCESS=
464
                             echo $"${a} was not installed from interactive"
467
                             echo $"${a} was not installed from interactive"
465
                         fi
468
                         fi
466
                     fi
469
                     fi
485
                                 install_completed ${a}
488
                                 install_completed ${a}
486
                                 echo $"${a} was installed"
489
                                 echo $"${a} was installed"
487
                             else
490
                             else
491
+                                APP_INSTALLED_SUCCESS=
488
                                 echo $"${a} was not installed"
492
                                 echo $"${a} was not installed"
489
                             fi
493
                             fi
490
                         fi
494
                         fi

+ 7
- 0
src/freedombone-utils-setup Bestand weergeven

545
 
545
 
546
     if [[ $is_interactive == "menuconfig"* ]]; then
546
     if [[ $is_interactive == "menuconfig"* ]]; then
547
         ${PROJECT_NAME}-addremove add-all
547
         ${PROJECT_NAME}-addremove add-all
548
+        if [ ! "$?" = "0" ]; then
549
+            exit 72524
550
+        fi
548
     fi
551
     fi
549
 
552
 
550
     if [[ $is_interactive == "noninteractive" || $is_interactive == "headless" ]]; then
553
     if [[ $is_interactive == "noninteractive" || $is_interactive == "headless" ]]; then
551
         function_check install_apps
554
         function_check install_apps
552
         install_apps
555
         install_apps
556
+        if [ ! $APP_INSTALLED_SUCCESS ]; then
557
+            echo $'One or more apps failed to install'
558
+            exit 368224
559
+        fi
553
     fi
560
     fi
554
 }
561
 }
555
 
562