From 2f1a8bf3453a08dbd6f6ac08911b5ae24f33b212 Mon Sep 17 00:00:00 2001
From: webreflection <andrea.giammarchi@gmail.com>
Date: Wed, 2 Oct 2024 10:29:54 +0200
Subject: [PATCH] better init-pi

---
 init-pi               | 23 ++++++++++++++++++-----
 install/weston-launch |  4 +---
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/init-pi b/init-pi
index 55eb733..5292244 100644
--- a/init-pi
+++ b/init-pi
@@ -3,9 +3,13 @@
 # RPi3 - RPi4 => boot 512M
 # root: init
 if [ "$USER" = "root" ] || [ "$(whoami)" = "root" ]; then
+    echo 'ParallelDownloads = 4' >> /etc/pacman.conf
     pacman-key --init
     pacman-key --populate archlinuxarm
-    pacman -Syyu --noconfirm
+    while ! pacman -Syyu --noconfirm
+    do
+        :
+    done
 
     # optional RPi arm64 - Enables RPi5 too
     yes y | pacman -S --needed linux-rpi
@@ -22,14 +26,23 @@ else
     bash <(curl -s https://archibold.io/install/weston)
     bash <(curl -s https://archibold.io/install/weston-launch)
 
-    # optional cog + wpewebkit dependencies
-    sudo pacman -S --needed --noconfirm \
-        wpewebkit wpebackend-fdo meson wayland-protocols \
+    # cog dependencies
+    while ! sudo pacman -S --needed --noconfirm wpewebkit wpebackend-fdo meson wayland-protocols gtk4
+    do
+        :
+    done
+
+    # wpewebkit dependencies
+    while ! sudo pacman -S --needed --noconfirm \
         pipewire-jack libbluray \
         gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad \
         gstreamer-vaapi gst-libav \
         geoip geoclue \
-        weston mesa ttf-dejavu
+        noto-fonts noto-fonts-emoji \
+        ttf-dejavu # without this no cog !?!
+    do
+        :
+    done
 
     if [ "$(which aur 2> /dev/null)" = "" ]; then
         bash <(curl -s https://archibold.io/install/aur)
diff --git a/install/weston-launch b/install/weston-launch
index 4e1d2a1..3dc0d02 100644
--- a/install/weston-launch
+++ b/install/weston-launch
@@ -21,12 +21,10 @@ setWestonMode() {
   local MODE="$1"
   local NAME=""
   if [ -f ~/.config/weston.ini ]; then
-    sed -i "s/name=.*//;s/mode=.*//;/^$/d;s/\[/\n\[/" ~/.config/weston.ini
     for NAME in $(ls /sys/class/drm | grep HDMI); do
       if [ "$NAME" != "" ]; then
-        echo "name=${NAME:6}">>~/.config/weston.ini
-        echo "mode=${MODE}">>~/.config/weston.ini
         # prefer one output only
+        sed -i "s/name=.*/name=${NAME:6}/;s/mode=.*/mode=${MODE}/" ~/.config/weston.ini
         return
       fi
     done