Avoid bad app sequence

This commit is contained in:
Bob Mottram 2018-05-09 15:33:48 +01:00
parent c98b2f2e00
commit a1a7e92d90
1 changed files with 18 additions and 14 deletions

View File

@ -163,6 +163,7 @@ function remove_apps_selected {
# shellcheck disable=SC2068 # shellcheck disable=SC2068
for a in ${APPS_INSTALLED[@]} for a in ${APPS_INSTALLED[@]}
do do
if [[ $(app_not_on_onion_only "$a") != "0" ]]; then
if [[ ${APPS_INSTALLED[$app_index]} == "1" ]]; then if [[ ${APPS_INSTALLED[$app_index]} == "1" ]]; then
if [[ ${APPS_CHOSEN[$app_index]} == "0" ]]; then if [[ ${APPS_CHOSEN[$app_index]} == "0" ]]; then
if [ ${n} -gt 0 ]; then if [ ${n} -gt 0 ]; then
@ -173,6 +174,7 @@ function remove_apps_selected {
n=$((n+1)) n=$((n+1))
fi fi
fi fi
fi
app_index=$((app_index+1)) app_index=$((app_index+1))
done done
@ -208,6 +210,7 @@ function install_apps_selected {
# shellcheck disable=SC2068 # shellcheck disable=SC2068
for a in ${APPS_INSTALLED[@]} for a in ${APPS_INSTALLED[@]}
do do
if [[ $(app_not_on_onion_only "$a") != "0" ]]; then
if [[ ${APPS_INSTALLED[$app_index]} == "0" ]]; then if [[ ${APPS_INSTALLED[$app_index]} == "0" ]]; then
if [[ ${APPS_CHOSEN[$app_index]} == "1" ]]; then if [[ ${APPS_CHOSEN[$app_index]} == "1" ]]; then
if [ ${n} -gt 0 ]; then if [ ${n} -gt 0 ]; then
@ -218,6 +221,7 @@ function install_apps_selected {
n=$((n+1)) n=$((n+1))
fi fi
fi fi
fi
app_index=$((app_index+1)) app_index=$((app_index+1))
done done