|
7 | 7 | # This file is a part of the Armbian Build Framework |
8 | 8 | # https://github.com/armbian/build/ |
9 | 9 |
|
10 | | -function desktop_element_available_for_arch() { |
11 | | - local desktop_element_path="${1}" |
12 | | - local targeted_arch="${2}" |
13 | | - local arch_limitation_file="${1}/architectures" |
14 | | - if [[ -f "${arch_limitation_file}" ]]; then |
15 | | - if ! grep -- "${targeted_arch}" "${arch_limitation_file}" &> /dev/null; then |
16 | | - return 1 |
17 | | - fi |
18 | | - fi |
19 | | - return 0 |
20 | | -} |
21 | | - |
22 | | -function desktop_element_supported() { |
23 | | - local desktop_element_path="${1}" |
24 | | - local support_level_filepath="${desktop_element_path}/support" |
25 | | - declare -g desktop_element_supported_result=0 |
26 | | - if [[ -f "${support_level_filepath}" ]]; then |
27 | | - local support_level |
28 | | - support_level="$(cat "${support_level_filepath}")" |
29 | | - if [[ "${support_level}" != "supported" && "${EXPERT}" != "yes" ]]; then |
30 | | - desktop_element_supported_result=65 |
31 | | - return 0 |
32 | | - fi |
33 | | - if ! desktop_element_available_for_arch "${desktop_element_path}" "${ARCH}"; then |
34 | | - desktop_element_supported_result=66 |
35 | | - return 0 |
36 | | - fi |
37 | | - else |
38 | | - desktop_element_supported_result=64 |
39 | | - return 0 |
40 | | - fi |
41 | | - return 0 |
42 | | -} |
| 10 | +# Interactive desktop configuration: DE selection + tier selection. |
| 11 | +# Desktop packages are installed by armbian-config's module_desktops |
| 12 | +# at image-build time (see distro-agnostic.sh). This file collects |
| 13 | +# the two user-facing choices: which DE and which tier. |
| 14 | +# |
| 15 | +# The available DEs are queried from armbian-config's YAML-driven |
| 16 | +# desktop definitions. The configng repo is cloned into cache/sources/ |
| 17 | +# via the build framework's standard fetch_from_repo, then the |
| 18 | +# standalone Python parser runs on the host (no chroot, no root). |
| 19 | +# |
| 20 | +# Variables set: |
| 21 | +# DESKTOP_ENVIRONMENT — xfce, gnome, kde-plasma, mate, cinnamon, ... |
| 22 | +# DESKTOP_TIER — minimal, mid, full |
| 23 | +# |
| 24 | +# Legacy variables (removed — armbian-config YAML tiers subsume them): |
| 25 | +# DESKTOP_ENVIRONMENT_CONFIG_NAME |
| 26 | +# DESKTOP_APPGROUPS_SELECTED |
43 | 27 |
|
44 | | -function desktop_environments_prepare_menu() { |
45 | | - for desktop_env_dir in "${DESKTOP_CONFIGS_DIR}/"*; do |
46 | | - local desktop_env_name expert_infos="" desktop_element_supported_result=0 |
47 | | - desktop_env_name="$(basename "${desktop_env_dir}")" |
48 | | - [[ "${EXPERT}" == "yes" ]] && expert_infos="[$(cat "${desktop_env_dir}/support" 2> /dev/null)]" |
49 | | - desktop_element_supported "${desktop_env_dir}" "${ARCH}" |
50 | | - [[ ${desktop_element_supported_result} == 0 ]] && options+=("${desktop_env_name}" "${desktop_env_name^} desktop environment ${expert_infos}") |
51 | | - done |
52 | | - return 0 |
53 | | -} |
| 28 | +function interactive_desktop_main_configuration() { |
| 29 | + [[ $BUILD_DESKTOP != "yes" ]] && return 0 |
54 | 30 |
|
55 | | -function desktop_environment_check_if_valid() { |
56 | | - local error_msg="" desktop_element_supported_result=0 |
57 | | - desktop_element_supported "${DESKTOP_ENVIRONMENT_DIRPATH}" "${ARCH}" |
58 | | - |
59 | | - if [[ ${desktop_element_supported_result} == 0 ]]; then |
60 | | - return |
61 | | - elif [[ ${desktop_element_supported_result} == 64 ]]; then |
62 | | - error_msg+="Either the desktop environment ${DESKTOP_ENVIRONMENT} does not exist " |
63 | | - error_msg+="or the file ${DESKTOP_ENVIRONMENT_DIRPATH}/support is missing" |
64 | | - elif [[ ${desktop_element_supported_result} == 65 ]]; then |
65 | | - error_msg+="Only experts can build an image with the desktop environment \"${DESKTOP_ENVIRONMENT}\", since the Armbian team won't offer any support for it (EXPERT=${EXPERT})" |
66 | | - elif [[ ${desktop_element_supported_result} == 66 ]]; then |
67 | | - error_msg+="The desktop environment \"${DESKTOP_ENVIRONMENT}\" has no packages for your targeted board architecture (BOARD=${BOARD} ARCH=${ARCH}). " |
68 | | - error_msg+="The supported boards architectures are : " |
69 | | - error_msg+="$(cat "${DESKTOP_ENVIRONMENT_DIRPATH}/architectures")" |
70 | | - fi |
| 31 | + display_alert "desktop-config" "DESKTOP_ENVIRONMENT entry: ${DESKTOP_ENVIRONMENT}" "debug" |
71 | 32 |
|
72 | | - # supress error when cache is rebuilding |
73 | | - [[ -n "$ROOT_FS_CREATE_ONLY" ]] && exit 0 |
| 33 | + # --- DE selection --- |
| 34 | + if [[ -z $DESKTOP_ENVIRONMENT ]]; then |
74 | 35 |
|
75 | | - exit_with_error "${error_msg}" |
76 | | -} |
| 36 | + # Fetch armbian-config (configng) to get the YAML desktop |
| 37 | + # definitions and the standalone Python parser. |
| 38 | + fetch_from_repo "https://github.com/armbian/configng" "armbian-configng" "branch:main" |
77 | 39 |
|
78 | | -function interactive_desktop_main_configuration() { |
79 | | - [[ $BUILD_DESKTOP != "yes" ]] && return 0 # Only for desktops. |
| 40 | + local configng_dir="${SRC}/cache/sources/armbian-configng" |
| 41 | + local yaml_dir="${configng_dir}/tools/modules/desktops/yaml" |
| 42 | + local parser="${configng_dir}/tools/modules/desktops/scripts/parse_desktop_yaml.py" |
80 | 43 |
|
81 | | - DESKTOP_ELEMENTS_DIR="${SRC}/config/desktop/${RELEASE}" |
82 | | - DESKTOP_CONFIGS_DIR="${DESKTOP_ELEMENTS_DIR}/environments" |
83 | | - DESKTOP_CONFIG_PREFIX="config_" |
84 | | - DESKTOP_APPGROUPS_DIR="${DESKTOP_ELEMENTS_DIR}/appgroups" |
| 44 | + if [[ ! -f "${parser}" ]]; then |
| 45 | + exit_with_error "Desktop parser not found at ${parser}" \ |
| 46 | + "armbian-config clone may be incomplete" |
| 47 | + fi |
85 | 48 |
|
86 | | - display_alert "desktop-config" "DESKTOP_ENVIRONMENT entry: ${DESKTOP_ENVIRONMENT}" "debug" |
| 49 | + local de_json |
| 50 | + de_json=$(python3 "${parser}" "${yaml_dir}" --list-json "${RELEASE}" "${ARCH}" 2>/dev/null) |
| 51 | + if [[ -z "${de_json}" ]]; then |
| 52 | + exit_with_error "No desktop environments available for ${RELEASE}/${ARCH}" \ |
| 53 | + "Parser returned an empty list" |
| 54 | + fi |
87 | 55 |
|
88 | | - if [[ -z $DESKTOP_ENVIRONMENT ]]; then |
89 | | - options=() |
90 | | - desktop_environments_prepare_menu |
91 | | - if [[ "${options[0]}" == "" ]]; then |
92 | | - exit_with_error "No desktop environment seems to be available for your board ${BOARD} (ARCH : ${ARCH} - EXPERT : ${EXPERT})" |
| 56 | + # Build dialog options from the JSON output. Only show |
| 57 | + # `status: supported` DEs unless EXPERT mode is on. |
| 58 | + local -a options=() |
| 59 | + while IFS=$'\t' read -r de_name de_desc de_status; do |
| 60 | + [[ -z "${de_name}" ]] && continue |
| 61 | + if [[ "${de_status}" != "supported" && "${EXPERT}" != "yes" ]]; then |
| 62 | + continue |
| 63 | + fi |
| 64 | + local label="${de_desc}" |
| 65 | + [[ "${de_status}" != "supported" ]] && label="${de_desc} [${de_status}]" |
| 66 | + options+=("${de_name}" "${label}") |
| 67 | + done < <(echo "${de_json}" | python3 -c " |
| 68 | +import sys, json |
| 69 | +for de in json.load(sys.stdin): |
| 70 | + if de.get('supported'): |
| 71 | + print(de.get('name','') + '\t' + de.get('description','') + '\t' + de.get('status','')) |
| 72 | +" 2>/dev/null) |
| 73 | + |
| 74 | + if [[ "${#options[@]}" -eq 0 ]]; then |
| 75 | + exit_with_error "No desktop environments available for ${RELEASE}/${ARCH}" |
93 | 76 | fi |
94 | 77 |
|
95 | | - display_alert "Desktops available" "${options[*]}" "debug" |
96 | | - dialog_menu "Choose a desktop environment" "$backtitle" "Select the default desktop environment to bundle with this image" "${options[@]}" |
| 78 | + dialog_menu "Choose a desktop environment" "$backtitle" \ |
| 79 | + "Select the default desktop environment to bundle with this image" \ |
| 80 | + "${options[@]}" |
97 | 81 | set_interactive_config_value DESKTOP_ENVIRONMENT "${DIALOG_MENU_RESULT}" |
98 | 82 |
|
99 | | - unset options |
100 | 83 | if [[ -z "${DESKTOP_ENVIRONMENT}" ]]; then |
101 | | - exit_with_error "No desktop environment selected..." |
| 84 | + exit_with_error "No desktop environment selected" |
102 | 85 | fi |
103 | 86 | fi |
104 | 87 |
|
105 | 88 | display_alert "desktop-config" "DESKTOP_ENVIRONMENT selected: ${DESKTOP_ENVIRONMENT}" "debug" |
106 | 89 |
|
107 | | - DESKTOP_ENVIRONMENT_DIRPATH="${DESKTOP_CONFIGS_DIR}/${DESKTOP_ENVIRONMENT}" |
108 | | - desktop_environment_check_if_valid # Make sure desktop config is sane. |
109 | | - |
110 | | - display_alert "desktop-config" "DESKTOP_ENVIRONMENT_CONFIG_NAME entry: ${DESKTOP_ENVIRONMENT_CONFIG_NAME}" "debug" |
111 | | - |
112 | | - if [[ -z $DESKTOP_ENVIRONMENT_CONFIG_NAME ]]; then |
113 | | - # @FIXME: Myy: Check for empty folders, just in case the current maintainer messed up |
114 | | - # Note, we could also ignore it and don't show anything in the previous menu, but that hides information and make debugging harder, which I |
115 | | - # don't like. Adding desktop environments as a maintainer is not a trivial nor common task. |
116 | | - options=() |
117 | | - for configuration in "${DESKTOP_ENVIRONMENT_DIRPATH}/${DESKTOP_CONFIG_PREFIX}"*; do |
118 | | - config_filename=$(basename ${configuration}) |
119 | | - config_name=${config_filename#"${DESKTOP_CONFIG_PREFIX}"} |
120 | | - options+=("${config_filename}" "${config_name} configuration") |
121 | | - done |
122 | | - |
123 | | - dialog_menu "Choose the desktop environment config" "$backtitle" "Select the configuration for this environment." "${options[@]}" |
124 | | - set_interactive_config_value DESKTOP_ENVIRONMENT_CONFIG_NAME "${DIALOG_MENU_RESULT}" |
125 | | - unset options |
126 | | - |
127 | | - if [[ -z $DESKTOP_ENVIRONMENT_CONFIG_NAME ]]; then |
128 | | - exit_with_error "No desktop configuration selected... Do you really want a desktop environment ?" |
| 90 | + # --- Tier selection --- |
| 91 | + if [[ -z $DESKTOP_TIER ]]; then |
| 92 | + local -a options=( |
| 93 | + "minimal" "DE + display manager (~500 MB)" |
| 94 | + "mid" "Browser, file manager, media apps (~1 GB)" |
| 95 | + "full" "Office, creative, dev tools (~2.5 GB)" |
| 96 | + ) |
| 97 | + dialog_menu "Choose desktop tier" "$backtitle" \ |
| 98 | + "Select which package set to install with this desktop.\nTiers can be upgraded or downgraded at any time\nusing armbian-config on the running system." \ |
| 99 | + "${options[@]}" |
| 100 | + set_interactive_config_value DESKTOP_TIER "${DIALOG_MENU_RESULT}" |
| 101 | + |
| 102 | + if [[ -z "${DESKTOP_TIER}" ]]; then |
| 103 | + DESKTOP_TIER="mid" |
129 | 104 | fi |
130 | 105 | fi |
131 | | - display_alert "desktop-config" "DESKTOP_ENVIRONMENT_CONFIG_NAME exit: ${DESKTOP_ENVIRONMENT_CONFIG_NAME}" "debug" |
132 | | - |
133 | | - declare -g DESKTOP_ENVIRONMENT_PACKAGE_LIST_DIRPATH="${DESKTOP_ENVIRONMENT_DIRPATH}/${DESKTOP_ENVIRONMENT_CONFIG_NAME}" |
134 | | - declare -g DESKTOP_ENVIRONMENT_PACKAGE_LIST_FILEPATH="${DESKTOP_ENVIRONMENT_PACKAGE_LIST_DIRPATH}/packages" |
135 | | - |
136 | | - display_alert "desktop-config" "DESKTOP_APPGROUPS_SELECTED+x entry: ${DESKTOP_APPGROUPS_SELECTED+x}" "debug" |
137 | | - # "-z ${VAR+x}" allows to check for unset variable |
138 | | - # Technically, someone might want to build a desktop with no additional |
139 | | - # appgroups. |
140 | | - if [[ -z ${DESKTOP_APPGROUPS_SELECTED+x} ]]; then |
141 | | - options=() |
142 | | - for appgroup_path in "${DESKTOP_APPGROUPS_DIR}/"*; do |
143 | | - appgroup="$(basename "${appgroup_path}")" |
144 | | - options+=("${appgroup}" "${appgroup^}" off) |
145 | | - done |
146 | | - |
147 | | - dialog_checklist "Choose desktop softwares to add" "$backtitle" "Select which kind of softwares you'd like to add to your build" "${options[@]}" |
148 | | - set_interactive_config_value DESKTOP_APPGROUPS_SELECTED "${DIALOG_CHECKLIST_RESULT}" |
149 | | - unset options |
150 | | - fi |
151 | | - display_alert "desktop-config" "DESKTOP_APPGROUPS_SELECTED exit: ${DESKTOP_APPGROUPS_SELECTED}" "debug" |
| 106 | + |
| 107 | + display_alert "desktop-config" "DESKTOP_TIER selected: ${DESKTOP_TIER}" "debug" |
152 | 108 | } |
0 commit comments