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

Some apps will not install on arm

This commit is contained in:
Bob Mottram 2018-05-11 13:43:54 +01:00
parent 5442dd106c
commit 71c2059742
2 changed files with 57 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/freedombone-app-rocketchat
View File

@ -29,6 +29,7 @@ VARIANTS='full full-vim'
IN_DEFAULT_INSTALL=0
SHOW_ON_ABOUT=1
NOT_ON_ARM=1
ROCKETCHAT_DOMAIN_NAME=
ROCKETCHAT_CODE=

21
src/freedombone-utils-selector
View File

@ -286,6 +286,19 @@ function app_not_on_onion_only {
echo "1"
}
function app_not_on_arm {
app_name="$1"
if grep -q "NOT_ON_ARM=1" "/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-${app_name}"; then
archtype=$(uname -m)
if [[ "$archtype" == 'arm'* ]]; then
echo "0"
return
fi
fi
echo "1"
}
function enough_ram_for_app {
app_name="$1"
@ -320,6 +333,7 @@ function detect_apps {
app_name=$(echo "${filename}" | awk -F '-app-' '{print $2}')
if [[ $(enough_ram_for_app "$app_name") == "0" ]]; then
if [[ $(app_not_on_onion_only "$app_name") != "0" ]]; then
if [[ $(app_not_on_arm "$app_name") != "0" ]]; then
# shellcheck disable=SC2068
if ! item_in_array "${app_name}" ${APPS_AVAILABLE[@]}; then
APPS_AVAILABLE+=("${app_name}")
@ -327,6 +341,7 @@ function detect_apps {
fi
fi
fi
fi
done
function_check get_apps_installed
@ -356,6 +371,7 @@ function detect_installable_apps {
if [[ $(enough_ram_for_app "$app_name") == "0" ]]; then
if [[ $(app_not_on_onion_only "$app_name") != "0" ]]; then
if [[ $(app_not_on_arm "$app_name") != "0" ]]; then
# shellcheck disable=SC2068
if ! item_in_array "${app_name}" ${APPS_AVAILABLE[@]}; then
variants_list=$(app_variants "$filename")
@ -371,6 +387,7 @@ function detect_installable_apps {
fi
fi
fi
fi
done
}
@ -392,6 +409,7 @@ function detect_installed_apps {
if [[ $(enough_ram_for_app "$app_name") == "0" ]]; then
if [[ $(app_not_on_onion_only "$app_name") != "0" ]]; then
if [[ $(app_not_on_arm "$app_name") != "0" ]]; then
if [[ $(app_is_installed "$app_name") == "1" ]]; then
# shellcheck disable=SC2068
if ! item_in_array "${app_name}" ${APPS_AVAILABLE[@]}; then
@ -404,6 +422,7 @@ function detect_installed_apps {
fi
fi
fi
fi
done
}
@ -431,6 +450,7 @@ function choose_apps_for_variant {
app_name=$(echo "${filename}" | awk -F '-app-' '{print $2}')
if [[ $(enough_ram_for_app "$app_name") == "0" ]]; then
if [[ $(app_not_on_onion_only "$app_name") != "0" ]]; then
if [[ $(app_not_on_arm "$app_name") != "0" ]]; then
# shellcheck disable=SC2068
if item_in_array "${app_name}" ${APPS_AVAILABLE[@]}; then
if grep -q "VARIANTS=" "${filename}"; then
@ -455,6 +475,7 @@ function choose_apps_for_variant {
fi
fi
fi
fi
done
function_check get_apps_installed