Skip to content
Snippets Groups Projects
Commit d925c4f0 authored by Bob Mottram's avatar Bob Mottram
Browse files

Check that all chosen apps actually do get installed

parent 11f58991
No related branches found
No related tags found
No related merge requests found
...@@ -174,6 +174,10 @@ function install_apps_selected { ...@@ -174,6 +174,10 @@ function install_apps_selected {
# install the apps # install the apps
read_configuration read_configuration
install_apps interactive install_apps interactive
if [ ! $APP_INSTALLED_SUCCESS ]; then
echo $'One or more apps failed to install'
exit 357223
fi
} }
if [[ $1 == "test"* ]]; then if [[ $1 == "test"* ]]; then
......
...@@ -426,6 +426,8 @@ function install_apps_interactive { ...@@ -426,6 +426,8 @@ function install_apps_interactive {
function install_apps { function install_apps {
is_interactive=$1 is_interactive=$1
APP_INSTALLED_SUCCESS=1
# interactive install configuration for each app # interactive install configuration for each app
if [ ${is_interactive} ]; then if [ ${is_interactive} ]; then
install_apps_interactive install_apps_interactive
...@@ -461,6 +463,7 @@ function install_apps { ...@@ -461,6 +463,7 @@ function install_apps {
install_completed ${a} install_completed ${a}
echo $"${a} was installed from interactive" echo $"${a} was installed from interactive"
else else
APP_INSTALLED_SUCCESS=
echo $"${a} was not installed from interactive" echo $"${a} was not installed from interactive"
fi fi
fi fi
...@@ -485,6 +488,7 @@ function install_apps { ...@@ -485,6 +488,7 @@ function install_apps {
install_completed ${a} install_completed ${a}
echo $"${a} was installed" echo $"${a} was installed"
else else
APP_INSTALLED_SUCCESS=
echo $"${a} was not installed" echo $"${a} was not installed"
fi fi
fi fi
......
...@@ -545,11 +545,18 @@ function setup_apps { ...@@ -545,11 +545,18 @@ function setup_apps {
if [[ $is_interactive == "menuconfig"* ]]; then if [[ $is_interactive == "menuconfig"* ]]; then
${PROJECT_NAME}-addremove add-all ${PROJECT_NAME}-addremove add-all
if [ ! "$?" = "0" ]; then
exit 72524
fi
fi fi
if [[ $is_interactive == "noninteractive" || $is_interactive == "headless" ]]; then if [[ $is_interactive == "noninteractive" || $is_interactive == "headless" ]]; then
function_check install_apps function_check install_apps
install_apps install_apps
if [ ! $APP_INSTALLED_SUCCESS ]; then
echo $'One or more apps failed to install'
exit 368224
fi
fi fi
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment