free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check that all chosen apps actually do get installed

This commit is contained in:
Bob Mottram 2016-10-19 10:50:22 +01:00
parent 11f58991b1
commit d925c4f00d
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/freedombone-addremove
View File

@ -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

4
src/freedombone-utils-selector
View File

@ -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

7
src/freedombone-utils-setup
View File

@ -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
}