From 19c816f2948a5d048a7899f9404cc2a9bff317f1 Mon Sep 17 00:00:00 2001
From: jo <ljonas@riseup.net>
Date: Sun, 17 Oct 2021 02:57:09 +0200
Subject: [PATCH] Update paths after playout move
---
.github/dependabot.yml | 2 +-
.github/workflows/test.yml | 2 +-
.github/workflows/tools.yml | 2 +-
install | 14 +++++++-------
playout/Makefile | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 1cb48fe37..07c285702 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -54,7 +54,7 @@ updates:
- dependencies
- package-ecosystem: "pip"
- directory: "/python_apps/pypo"
+ directory: "/playout"
schedule:
interval: "daily"
labels:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bd5d37a5f..ee4aa98c8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -129,7 +129,7 @@ jobs:
make -C analyzer lint
make -C worker lint
make -C api_client lint
- make -C python_apps/pypo lint
+ make -C playout lint
test:
runs-on: ubuntu-latest
diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml
index 8e5aadbcd..ddd969557 100644
--- a/.github/workflows/tools.yml
+++ b/.github/workflows/tools.yml
@@ -47,7 +47,7 @@ jobs:
run: |
tools/packages.py --dev --format line ${{ matrix.release }} \
analyzer \
- python_apps/pypo \
+ playout \
> packages.list
- name: Generate Dockerfile
diff --git a/install b/install
index 8fc4078e3..049f17c46 100755
--- a/install
+++ b/install
@@ -206,7 +206,7 @@ function systemInitInstall() {
alt_path="${target_path//libretime-/airtime-}"
;;
libretime-liquidsoap | libretime-playout)
- source_path="${python_source_path}/pypo/install/systemd/${service_name}.service"
+ source_path="${SCRIPT_DIR}/playout/install/systemd/${service_name}.service"
target_path="/etc/systemd/system/${service_name}.service"
alt_path="${target_path//libretime-/airtime-}"
;;
@@ -268,7 +268,7 @@ function systemInitInstall() {
user=""
;;
libretime-liquidsoap | libretime-playout)
- source_path="${python_source_path}/pypo/install/upstart/${service_name}.conf.template"
+ source_path="${SCRIPT_DIR}/playout/install/upstart/${service_name}.conf.template"
target_path="/etc/init/${service_name}.conf"
user=${user:-$web_user}
;;
@@ -308,7 +308,7 @@ function systemInitInstall() {
user=""
;;
libretime-liquidsoap | libretime-playout)
- source_path="${python_source_path}/pypo/install/sysvinit/${service_name}"
+ source_path="${SCRIPT_DIR}/playout/install/sysvinit/${service_name}"
target_path="/etc/init.d/${service_name}"
user=${user:-$web_user}
;;
@@ -760,7 +760,7 @@ if [ "$ignore_dependencies" = "f" ]; then
"${SCRIPT_DIR}/legacy"
"${SCRIPT_DIR}/api"
"${SCRIPT_DIR}/analyzer"
- "${SCRIPT_DIR}/python_apps/pypo"
+ "${SCRIPT_DIR}/playout"
)
set -e
@@ -1015,15 +1015,15 @@ if [ ! -d /var/log/airtime ]; then
verbose "\n * Copying logrotate files..."
loudCmd "cp ${AIRTIMEROOT}/legacy/build/airtime-php.logrotate /etc/logrotate.d/airtime-php"
- loudCmd "cp ${AIRTIMEROOT}/python_apps/pypo/liquidsoap/logrotate.conf /etc/logrotate.d/libretime-liquidsoap"
+ loudCmd "cp ${AIRTIMEROOT}/playout/liquidsoap/logrotate.conf /etc/logrotate.d/libretime-liquidsoap"
fi
verbose "\n * Installing API client..."
loudCmd "$pip_cmd install ${AIRTIMEROOT}/api_client"
verbose "...Done"
-verbose "\n * Installing pypo and liquidsoap..."
-loudCmd "$pip_cmd install ${AIRTIMEROOT}/python_apps/pypo"
+verbose "\n * Installing playout and liquidsoap..."
+loudCmd "$pip_cmd install ${AIRTIMEROOT}/playout"
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/playout/Makefile b/playout/Makefile
index 20244d0b1..921892b45 100644
--- a/playout/Makefile
+++ b/playout/Makefile
@@ -1,6 +1,6 @@
all: lint
-include ../../tools/python.mk
+include ../tools/python.mk
PIP_INSTALL := --editable .
PYLINT_ARG := liquidsoap pypo