This commit is contained in:
Bob Mottram 2018-05-09 16:17:10 +01:00
parent ddb9b7a353
commit fcb209d3a9
1 changed files with 24 additions and 29 deletions

View File

@ -108,7 +108,6 @@ function show_apps {
# shellcheck disable=SC2068 # shellcheck disable=SC2068
for a in ${APPS_AVAILABLE[@]} for a in ${APPS_AVAILABLE[@]}
do do
if [[ $(app_not_on_onion_only "$a") != "0" ]]; then
if [[ ${APPS_INSTALLED[$app_index]} == "0" && "$select_all_apps" != "add-all" ]]; then if [[ ${APPS_INSTALLED[$app_index]} == "0" && "$select_all_apps" != "add-all" ]]; then
applist="$applist $n $a off" applist="$applist $n $a off"
else else
@ -120,7 +119,6 @@ function show_apps {
fi fi
n=$((n+1)) n=$((n+1))
app_index=$((app_index+1)) app_index=$((app_index+1))
fi
done done
# shellcheck disable=SC2086 # shellcheck disable=SC2086
@ -149,7 +147,6 @@ 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
@ -161,7 +158,6 @@ function remove_apps_selected {
fi fi
fi fi
app_index=$((app_index+1)) app_index=$((app_index+1))
fi
done done
# if no apps to be removed then don't do anything # if no apps to be removed then don't do anything
@ -196,7 +192,6 @@ 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
@ -208,7 +203,7 @@ function install_apps_selected {
fi fi
fi fi
app_index=$((app_index+1)) app_index=$((app_index+1))
fi
done done
# if no apps to be installed then don't do anything # if no apps to be installed then don't do anything