diff --git a/src/freedombone-addremove b/src/freedombone-addremove index 6a7323ff92dfdd5f24d8edf0226a01bdee003cc4..ace930ad12ffb3c6c94ef2b3f2df107dc7de9057 100755 --- a/src/freedombone-addremove +++ b/src/freedombone-addremove @@ -174,6 +174,10 @@ function install_apps_selected { # install the apps read_configuration install_apps interactive + if [ ! $APP_INSTALLED_SUCCESS ]; then + echo $'One or more apps failed to install' + exit 357223 + fi } if [[ $1 == "test"* ]]; then diff --git a/src/freedombone-utils-selector b/src/freedombone-utils-selector index 39f5dd531c2734449214eaa0394166e7bbe4f77b..4542ba3ef9663ba2993c30ee5fad648c23a97cbf 100755 --- a/src/freedombone-utils-selector +++ b/src/freedombone-utils-selector @@ -426,6 +426,8 @@ function install_apps_interactive { function install_apps { is_interactive=$1 + APP_INSTALLED_SUCCESS=1 + # interactive install configuration for each app if [ ${is_interactive} ]; then install_apps_interactive @@ -461,6 +463,7 @@ function install_apps { install_completed ${a} echo $"${a} was installed from interactive" else + APP_INSTALLED_SUCCESS= echo $"${a} was not installed from interactive" fi fi @@ -485,6 +488,7 @@ function install_apps { install_completed ${a} echo $"${a} was installed" else + APP_INSTALLED_SUCCESS= echo $"${a} was not installed" fi fi diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup index 83f792189e36c7b31a3e35c22e5e590fc921082b..552eeda468ba916985ea78a30cad70cf40c119fb 100755 --- a/src/freedombone-utils-setup +++ b/src/freedombone-utils-setup @@ -545,11 +545,18 @@ function setup_apps { if [[ $is_interactive == "menuconfig"* ]]; then ${PROJECT_NAME}-addremove add-all + if [ ! "$?" = "0" ]; then + exit 72524 + fi fi if [[ $is_interactive == "noninteractive" || $is_interactive == "headless" ]]; then function_check install_apps install_apps + if [ ! $APP_INSTALLED_SUCCESS ]; then + echo $'One or more apps failed to install' + exit 368224 + fi fi }