From d7615cfe373043029c91557e57122421cce363f6 Mon Sep 17 00:00:00 2001
From: jo <ljonas@riseup.net>
Date: Fri, 1 Oct 2021 17:41:20 +0200
Subject: [PATCH] Install pypo with pip and change script prefix to default
/usr/local
---
install | 2 +-
python_apps/pypo/install/systemd/libretime-liquidsoap.service | 2 +-
python_apps/pypo/install/systemd/libretime-playout.service | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/install b/install
index 564de3411..259a70595 100755
--- a/install
+++ b/install
@@ -1028,7 +1028,7 @@ loudCmd "$pip_cmd install ${AIRTIMEROOT}/python_apps/api_clients"
verbose "...Done"
verbose "\n * Installing pypo and liquidsoap..."
-loudCmd "$python_bin ${AIRTIMEROOT}/python_apps/pypo/setup.py install --install-scripts=/usr/bin"
+loudCmd "$pip_cmd install ${AIRTIMEROOT}/python_apps/pypo"
loudCmd "mkdir -p /var/log/airtime/{pypo,pypo-liquidsoap} /var/tmp/airtime/pypo/{cache,files,tmp} /var/tmp/airtime/show-recorder/"
loudCmd "chown -R ${web_user}:${web_user} /var/log/airtime/{pypo,pypo-liquidsoap} /var/tmp/airtime/pypo/{cache,files,tmp} /var/tmp/airtime/show-recorder/"
systemInitInstall libretime-liquidsoap "$web_user"
diff --git a/python_apps/pypo/install/systemd/libretime-liquidsoap.service b/python_apps/pypo/install/systemd/libretime-liquidsoap.service
index 2d7a1abb9..ca1eb2f86 100644
--- a/python_apps/pypo/install/systemd/libretime-liquidsoap.service
+++ b/python_apps/pypo/install/systemd/libretime-liquidsoap.service
@@ -2,7 +2,7 @@
Description=Libretime Liquidsoap Service
[Service]
-ExecStart=/usr/bin/airtime-liquidsoap
+ExecStart=/usr/local/bin/airtime-liquidsoap
User=libretime-playout
Group=libretime-playout
Restart=always
diff --git a/python_apps/pypo/install/systemd/libretime-playout.service b/python_apps/pypo/install/systemd/libretime-playout.service
index bd86973a9..2009b9645 100644
--- a/python_apps/pypo/install/systemd/libretime-playout.service
+++ b/python_apps/pypo/install/systemd/libretime-playout.service
@@ -3,7 +3,7 @@ Description=Libretime Playout Service
After=network-online.target
[Service]
-ExecStart=/usr/bin/airtime-playout
+ExecStart=/usr/local/bin/airtime-playout
User=libretime-pypo
Group=libretime-pypo
Restart=always