From e711f6ae9dba7529a71a374abc20eae6a9c7c502 Mon Sep 17 00:00:00 2001
From: Fritz Elfert <fritz@fritz-elfert.de>
Date: Feb 21 2021 00:41:04 +0000
Subject: Fix icewm setup


---

diff --git a/jibri/jibri-icewm-setup.sh b/jibri/jibri-icewm-setup.sh
new file mode 100644
index 0000000..df6974f
--- /dev/null
+++ b/jibri/jibri-icewm-setup.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+cp /etc/jibri/asoundrc /run/jibri/.asoundrc
+mkdir /run/jibri/.icewm
+cp /etc/jibri/icewm.preferences /run/jibri/.icewm/settings
diff --git a/jibri/jibri-icewm.service b/jibri/jibri-icewm.service
index f6c91da..1eb459a 100644
--- a/jibri/jibri-icewm.service
+++ b/jibri/jibri-icewm.service
@@ -8,9 +8,7 @@ User=jibri
 Group=jibri
 Environment=DISPLAY=:0
 EnvironmentFile=-/etc/sysconfig/jibri
-ExecStartPre=/usr/bin/cp /etc/jibri/asoundrc /run/jibri/.asoundrc
-ExecStartpre=/usr/bin/mkdir /run/jibri/.icewm
-ExecStartPre=/usr/bin/cp /etc/jibri/icewm.preferences /run/jibri/.icewm/settings
+ExecStartPre=/usr/libexec/jibri-icewm-setup
 ExecStart=/usr/bin/icewm-session
 Restart=on-failure
 RestartPreventExitStatus=255
diff --git a/jibri/jibri.spec b/jibri/jibri.spec
index 6e036d7..2403750 100644
--- a/jibri/jibri.spec
+++ b/jibri/jibri.spec
@@ -22,6 +22,7 @@ Source9:    %{name}.conf
 Source10:   finalize_recording.sh
 Source11:   %{name}.sysconfig
 Source12:   %{name}.chromepolicy
+Source13:   %{name}-icewm-setup.sh
 Patch1:     0001-logconfig.patch
 Patch2:     0002-allow-overriding-webdriver-log.patch
 
@@ -110,6 +111,7 @@ install -D -m 644 %{SOURCE4} %{buildroot}%{_sysusersdir}/%{name}.conf
 install -D -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/%{name}.conf
 install -D -m 644 -t %{buildroot}%{_sysconfdir}/modules-load.d/ %{SOURCE7}
 install -D -m 755 %{SOURCE8} %{buildroot}%{_libexecdir}/%{name}
+install -D -m 755 %{SOURCE13} %{buildroot}%{_libexecdir}/%{name}-icewm-setup
 
 # documentation
 install -D -m 644 -t %{buildroot}/%{_pkgdocdir}/ *.md
@@ -161,7 +163,7 @@ test "$1" == "0" && rm -rf %{_rundir}/%{name}/{.cache,.config,.local} || true
 %{_tmpfilesdir}/%{name}.conf
 %{_sysusersdir}/%{name}.conf
 %{_sysconfdir}/modules-load.d/%{name}-*.conf
-%{_libexecdir}/%{name}
+%{_libexecdir}/%{name}*
 
 #-- CHANGELOG -----------------------------------------------------------------#
 %changelog