Further tweaks to the el9 script

1 files changed, 33 insertions, 2 deletions

diff --git a/el9.sh b/el9.sh
index 71d7c13..ab26868 100755
--- a/el9.sh
+++ b/el9.sh
@@ -15,7 +15,6 @@ $RIVERWM_BASE/share/pkgconfig
 
 _pfx="$RIVERWM_BASE"
 
-
 sudo dnf config-manager --set-enabled crb
 
 sudo yum -y install \
@@ -129,6 +128,8 @@ ninja -C build/
 ninja -C build/ install
 cd -
 
+export LD_LIBRARY_PATH="${RIVERWM_BASE}/lib64:${RIVERWM_BASE}/lib"
+
 # https://gitlab.gnome.org/GNOME/glib/
 # Needed for xdg-desktop-portal...
 # Libinput also needs a newer vesion...
@@ -407,6 +408,16 @@ meson compile -C build
 meson install -C build
 cd -
 
+if ! [ -d "$codedir/wlr-randr" ] ; then
+	git clone https://git.sr.ht/~emersion/wlr-randr \
+		"$codedir/wlr-randr"
+fi
+cd "$codedir/wlr-randr"
+git checkout v0.4.1
+meson setup -Dprefix="${_pfx}" build
+meson compile -C build
+meson install -C build
+cd -
 
 zigver=0.15.2
 zigdir="$RIVERWM_BASE/zig/zig$zigver"
@@ -437,13 +448,33 @@ cd -
 # ./bldSession.sh
 ./link.sh
 
+set +x
 
 echo '######################################################################'
 echo "NOTICE:"
 echo '######################################################################'
 echo
-echo You will need to add $RIVERWM_BASE/bin to your PATH and 
+echo 'You will need to setup your ~/.profile ( or more likely ) ~/.bashrc'
+echo
+echo 'Add the following:'
+
 echo $RIVERWM_BASE/lib64 to the LD_LIBRARY_PATH environment variable.
+cat <<EOF
+# Add a given path to the start of your \$PATH if it doesn't already
+# exist
+path_preappend() {
+	if [ -z "$1" ] ; then echo "need something to preappend" ; return ; fi
+	pth="$1"; shift
+	if ! echo "\$PATH" | grep -qF "\$pth" ; then
+		export PATH="\$pth:\$PATH"
+	fi
+}
+export RIVERWM_BASE="${RIVERWM_BASE:-$HOME/.local/opt/river}"
+export LD_LIBRARY_PATH="${RIVERWM}/lib64:${RIVERWM}/lib"
+path_preappend "${RIVERWM_BASE}/bin"
+EOF
 echo 
+echo "######################################################################"
+echo
 echo gdm has issues with wlcustom, login to a VT and run:
 echo . ~/.waylandrc