Browse Source

If apps fail to install then keep going but record them in the log

Bob Mottram 8 years ago
parent
commit
9e556faa8f
3 changed files with 2 additions and 9 deletions
  1. 0
    2
      src/freedombone-addremove
  2. 2
    5
      src/freedombone-utils-selector
  3. 0
    2
      src/freedombone-utils-setup

+ 0
- 2
src/freedombone-addremove View File

202
     install_apps interactive
202
     install_apps interactive
203
     if [ ! $APP_INSTALLED_SUCCESS ]; then
203
     if [ ! $APP_INSTALLED_SUCCESS ]; then
204
         echo $'One or more apps failed to install'
204
         echo $'One or more apps failed to install'
205
-        cat /tmp/failed_apps
206
-        exit 357223
207
     fi
205
     fi
208
 }
206
 }
209
 
207
 

+ 2
- 5
src/freedombone-utils-selector View File

427
     is_interactive=$1
427
     is_interactive=$1
428
 
428
 
429
     APP_INSTALLED_SUCCESS=1
429
     APP_INSTALLED_SUCCESS=1
430
-    if [ -f /tmp/failed_apps ]; then
431
-        rm /tmp/failed_apps
432
-    fi
433
 
430
 
434
     # interactive install configuration for each app
431
     # interactive install configuration for each app
435
     if [ ${is_interactive} ]; then
432
     if [ ${is_interactive} ]; then
466
                             install_completed ${a}
463
                             install_completed ${a}
467
                             echo $"${a} was installed from interactive"
464
                             echo $"${a} was installed from interactive"
468
                         else
465
                         else
469
-                            echo "  ${a}" >> /tmp/failed_apps
466
+                            echo "Failed to install: ${a}" >> /var/log/${PROJECT_NAME}.log
470
                             APP_INSTALLED_SUCCESS=
467
                             APP_INSTALLED_SUCCESS=
471
                             echo $"${a} was not installed from interactive"
468
                             echo $"${a} was not installed from interactive"
472
                         fi
469
                         fi
492
                                 install_completed ${a}
489
                                 install_completed ${a}
493
                                 echo $"${a} was installed"
490
                                 echo $"${a} was installed"
494
                             else
491
                             else
495
-                                echo "  ${a}" >> /tmp/failed_apps
492
+                                echo "Failed to install: ${a}" >> /var/log/${PROJECT_NAME}.log
496
                                 APP_INSTALLED_SUCCESS=
493
                                 APP_INSTALLED_SUCCESS=
497
                                 echo $"${a} was not installed"
494
                                 echo $"${a} was not installed"
498
                             fi
495
                             fi

+ 0
- 2
src/freedombone-utils-setup View File

555
         install_apps
555
         install_apps
556
         if [ ! $APP_INSTALLED_SUCCESS ]; then
556
         if [ ! $APP_INSTALLED_SUCCESS ]; then
557
             echo $'One or more apps failed to install'
557
             echo $'One or more apps failed to install'
558
-            cat /tmp/failed_apps
559
-            exit 368224
560
         fi
558
         fi
561
     fi
559
     fi
562
 }
560
 }