From 9e556faa8f90710189828ac2fd9103c93373861d Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 19 Oct 2016 20:21:49 +0100 Subject: [PATCH] If apps fail to install then keep going but record them in the log --- src/freedombone-addremove | 2 -- src/freedombone-utils-selector | 7 ++----- src/freedombone-utils-setup | 2 -- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/freedombone-addremove b/src/freedombone-addremove index 51f98d54..92b5062f 100755 --- a/src/freedombone-addremove +++ b/src/freedombone-addremove @@ -202,8 +202,6 @@ function install_apps_selected { install_apps interactive if [ ! $APP_INSTALLED_SUCCESS ]; then echo $'One or more apps failed to install' - cat /tmp/failed_apps - exit 357223 fi } diff --git a/src/freedombone-utils-selector b/src/freedombone-utils-selector index 8b418110..efbacf68 100755 --- a/src/freedombone-utils-selector +++ b/src/freedombone-utils-selector @@ -427,9 +427,6 @@ function install_apps { is_interactive=$1 APP_INSTALLED_SUCCESS=1 - if [ -f /tmp/failed_apps ]; then - rm /tmp/failed_apps - fi # interactive install configuration for each app if [ ${is_interactive} ]; then @@ -466,7 +463,7 @@ function install_apps { install_completed ${a} echo $"${a} was installed from interactive" else - echo " ${a}" >> /tmp/failed_apps + echo "Failed to install: ${a}" >> /var/log/${PROJECT_NAME}.log APP_INSTALLED_SUCCESS= echo $"${a} was not installed from interactive" fi @@ -492,7 +489,7 @@ function install_apps { install_completed ${a} echo $"${a} was installed" else - echo " ${a}" >> /tmp/failed_apps + echo "Failed to install: ${a}" >> /var/log/${PROJECT_NAME}.log APP_INSTALLED_SUCCESS= echo $"${a} was not installed" fi diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup index a6621feb..5b935a66 100755 --- a/src/freedombone-utils-setup +++ b/src/freedombone-utils-setup @@ -555,8 +555,6 @@ function setup_apps { install_apps if [ ! $APP_INSTALLED_SUCCESS ]; then echo $'One or more apps failed to install' - cat /tmp/failed_apps - exit 368224 fi fi }