From 5f53f6ac9cdf2d89bff93b0e3867de28d0ebc1c8 Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Wed, 23 Oct 2019 00:19:38 +0200 Subject: [PATCH] main/postmarketos-ui-weston: fix linting issues in start_weston.sh (!694) --- main/postmarketos-ui-weston/APKBUILD | 4 ++-- main/postmarketos-ui-weston/start_weston.sh | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/main/postmarketos-ui-weston/APKBUILD b/main/postmarketos-ui-weston/APKBUILD index 61e9ce09b..26711c264 100644 --- a/main/postmarketos-ui-weston/APKBUILD +++ b/main/postmarketos-ui-weston/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-weston pkgver=4 -pkgrel=11 +pkgrel=12 pkgdesc="(Wayland) Reference compositor (demo, not a phone interface)" url="https://postmarketos.org" arch="noarch" @@ -22,6 +22,6 @@ package() { install -Dm644 "$srcdir"/weston.ini.default \ "$pkgdir"/etc/xdg/weston/weston.ini.default } -sha512sums="60e26b12f5ad4936d70054f613b1178140dd5a601a1af3eb753dfb1b9a0d84d3a3bbea19ab62404793eab8bc4e0e40542bf1866ae80c91dfc7f7c8f6aeda1d10 start_weston.sh +sha512sums="4ea36781ab3fd1f38242a52ad200c5d0452f0b8265a1e59ad217a9ad8273b9db5d5a0c94baa137999ec256c77bb016dea8d4e384fad0a25b85f92f4b32a6efec start_weston.sh b712c9d4c846437656781656ec15e9b7e238a9244e0b77bf84b67f6661d44f68718330706f69ccb8b4d7f6182b8f17f273018ca461c0c40e49b9185f6eec168d weston.ini.default 6800b81055c854ef69c0084341e31841d4b06d1d894542f1e125d0d70b6606f11218bda0d29dab9a48594b4c2f815a540f91bfba6c2c22c3378040c41fe4bbb1 60-lightdm-autologin.conf" diff --git a/main/postmarketos-ui-weston/start_weston.sh b/main/postmarketos-ui-weston/start_weston.sh index 09e13b47d..e54455893 100644 --- a/main/postmarketos-ui-weston/start_weston.sh +++ b/main/postmarketos-ui-weston/start_weston.sh @@ -6,7 +6,8 @@ export DISPLAY=:0 # Create XDG_RUNTIME_DIR # https://wayland.freedesktop.org/building.html -export XDG_RUNTIME_DIR=/tmp/$(id -u)-runtime-dir +XDG_RUNTIME_DIR=/tmp/$(id -u)-runtime-dir +export XDG_RUNTIME_DIR if ! test -d "${XDG_RUNTIME_DIR}"; then mkdir "${XDG_RUNTIME_DIR}" chmod 0700 "${XDG_RUNTIME_DIR}" @@ -20,11 +21,11 @@ WESTON_OPTS="-c $cfg" # #633: Weston doesn't support autostarting applications (yet), so # we try to run postmarketos-demos for 10 seconds, until it succeeds. ( - for i in $(seq 0 19); do + for _ in $(seq 0 19); do sleep 0.5 postmarketos-demos && break done ) & -weston ${WESTON_OPTS} 2>&1 | logger -t "$(whoami):weston" +weston "${WESTON_OPTS}" 2>&1 | logger -t "$(whoami):weston"