Pārlūkot izejas kodu

Avoid bad app sequence

Bob Mottram 6 gadus atpakaļ
vecāks
revīzija
a1a7e92d90
1 mainītis faili ar 18 papildinājumiem un 14 dzēšanām
  1. 18
    14
      src/freedombone-addremove

+ 18
- 14
src/freedombone-addremove Parādīt failu

@@ -163,14 +163,16 @@ function remove_apps_selected {
163 163
     # shellcheck disable=SC2068
164 164
     for a in ${APPS_INSTALLED[@]}
165 165
     do
166
-        if [[ ${APPS_INSTALLED[$app_index]} == "1" ]]; then
167
-            if [[ ${APPS_CHOSEN[$app_index]} == "0" ]]; then
168
-                if [ ${n} -gt 0 ]; then
169
-                    removals="$removals ${APPS_AVAILABLE[$app_index]}"
170
-                else
171
-                    removals="${APPS_AVAILABLE[$app_index]}"
166
+        if [[ $(app_not_on_onion_only "$a") != "0" ]]; then
167
+            if [[ ${APPS_INSTALLED[$app_index]} == "1" ]]; then
168
+                if [[ ${APPS_CHOSEN[$app_index]} == "0" ]]; then
169
+                    if [ ${n} -gt 0 ]; then
170
+                        removals="$removals ${APPS_AVAILABLE[$app_index]}"
171
+                    else
172
+                        removals="${APPS_AVAILABLE[$app_index]}"
173
+                    fi
174
+                    n=$((n+1))
172 175
                 fi
173
-                n=$((n+1))
174 176
             fi
175 177
         fi
176 178
         app_index=$((app_index+1))
@@ -208,14 +210,16 @@ function install_apps_selected {
208 210
     # shellcheck disable=SC2068
209 211
     for a in ${APPS_INSTALLED[@]}
210 212
     do
211
-        if [[ ${APPS_INSTALLED[$app_index]} == "0" ]]; then
212
-            if [[ ${APPS_CHOSEN[$app_index]} == "1" ]]; then
213
-                if [ ${n} -gt 0 ]; then
214
-                    installs="$installs ${APPS_AVAILABLE[$app_index]}"
215
-                else
216
-                    installs="${APPS_AVAILABLE[$app_index]}"
213
+        if [[ $(app_not_on_onion_only "$a") != "0" ]]; then
214
+            if [[ ${APPS_INSTALLED[$app_index]} == "0" ]]; then
215
+                if [[ ${APPS_CHOSEN[$app_index]} == "1" ]]; then
216
+                    if [ ${n} -gt 0 ]; then
217
+                        installs="$installs ${APPS_AVAILABLE[$app_index]}"
218
+                    else
219
+                        installs="${APPS_AVAILABLE[$app_index]}"
220
+                    fi
221
+                    n=$((n+1))
217 222
                 fi
218
-                n=$((n+1))
219 223
             fi
220 224
         fi
221 225
         app_index=$((app_index+1))