Avoid xpra codec dependency on arm64 fallback
Alessandro committed
May 2, 2026 at 22:03 UTC
f3d5e6b14947efb733884e0975a76cda0332329d
1 file changed
+10
-5
docker/run/fs/ins/install_additional.sh
+10
-5
@@ -12,6 +12,8 @@ if ! command -v apt-get >/dev/null 2>&1; then
12
exit 0
13
fi
14
15
+XPRA_PACKAGES=(xpra xpra-x11 xpra-html5)
16
+
17
install_xpra_repo() {
18
local os_id=""
19
local codename=""
@@ -43,12 +45,13 @@ install_xpra_repo() {
45
configure_xpra_repo "$uri" "$suite" "$arch"
46
apt-get update
47
46
- if ! DEBIAN_FRONTEND=noninteractive apt-get install -s --no-install-recommends xpra xpra-x11 xpra-html5 >/tmp/xpra-install-check.log 2>&1; then
48
+ if ! xpra_install_check; then
49
if [ "$arch" != "amd64" ]; then
50
echo "xpra packages are not installable from ${uri} ${suite} for ${arch}; falling back to https://xpra.org trixie"
51
+ XPRA_PACKAGES=(xpra-server xpra-client xpra-client-gtk3 xpra-x11 xpra-html5)
52
configure_xpra_repo "https://xpra.org" "trixie" "$arch"
53
apt-get update
51
- if ! DEBIAN_FRONTEND=noninteractive apt-get install -s --no-install-recommends xpra xpra-x11 xpra-html5 >/tmp/xpra-install-check.log 2>&1; then
54
+ if ! xpra_install_check; then
55
cat /tmp/xpra-install-check.log
56
exit 1
57
fi
@@ -59,6 +62,10 @@ install_xpra_repo() {
62
fi
63
}
64
65
+xpra_install_check() {
66
+ DEBIAN_FRONTEND=noninteractive apt-get install -s --no-install-recommends "${XPRA_PACKAGES[@]}" >/tmp/xpra-install-check.log 2>&1
67
+}
68
+
69
configure_xpra_repo() {
70
local uri="$1"
71
local suite="$2"
@@ -84,9 +91,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
91
libreoffice-impress \
92
libreoffice-gtk3 \
93
python3-uno \
87
- xpra \
88
- xpra-x11 \
89
- xpra-html5 \
94
+ "${XPRA_PACKAGES[@]}" \
95
xfce4-session \
96
xfwm4 \
97
xfce4-panel \