From cf36eec5f8a0e36910f06397518737bc12c0c051 Mon Sep 17 00:00:00 2001
From: jo <ljonas@riseup.net>
Date: Sun, 17 Oct 2021 02:46:36 +0200
Subject: [PATCH] Update paths after wroker move

---
 .github/dependabot.yml     |  2 +-
 .github/workflows/test.yml |  2 +-
 install                    | 10 +++++-----
 worker/Makefile            |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index fe6704111..95dbd76b9 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -38,7 +38,7 @@ updates:
       - dependencies
 
   - package-ecosystem: "pip"
-    directory: "/python_apps/airtime-celery"
+    directory: "/worker"
     schedule:
       interval: "daily"
     labels:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b068a238a..716e451d5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -127,7 +127,7 @@ jobs:
         run: |
           make -C api lint
           make -C analyzer lint
-          make -C python_apps/airtime-celery lint
+          make -C worker lint
           make -C python_apps/api_clients lint
           make -C python_apps/pypo lint
 
diff --git a/install b/install
index ff811581b..6fc0e2448 100755
--- a/install
+++ b/install
@@ -201,7 +201,7 @@ function systemInitInstall() {
         alt_path="${target_path//libretime-/airtime_}"
         ;;
       libretime-celery)
-        source_path="${python_source_path}/airtime-celery/install/systemd/${service_name}.service"
+        source_path="${SCRIPT_DIR}/worker/install/systemd/${service_name}.service"
         target_path="/etc/systemd/system/${service_name}.service"
         alt_path="${target_path//libretime-/airtime-}"
         ;;
@@ -263,7 +263,7 @@ function systemInitInstall() {
         user=${user:-$web_user}
         ;;
       libretime-celery)
-        source_path="${python_source_path}/airtime-celery/install/upstart/${service_name}.conf"
+        source_path="${SCRIPT_DIR}/worker/install/upstart/${service_name}.conf"
         target_path="/etc/init/${service_name}.conf"
         user=""
         ;;
@@ -301,7 +301,7 @@ function systemInitInstall() {
         user=${user:-$web_user}
         ;;
       libretime-celery)
-        source_path="${python_source_path}/airtime-celery/install/sysvinit/${service_name}"
+        source_path="${SCRIPT_DIR}/worker/install/sysvinit/${service_name}"
         target_path="/etc/init.d/${service_name}"
         source_config_path="${python_source_path}/${service_name}/install/conf/${service_name}"
         target_config_path="/etc/default/${service_name}"
@@ -1030,8 +1030,8 @@ systemInitInstall libretime-liquidsoap "$web_user"
 systemInitInstall libretime-playout "$web_user"
 verbose "...Done"
 
-verbose "\n * Installing airtime-celery..."
-loudCmd "$pip_cmd install ${AIRTIMEROOT}/python_apps/airtime-celery"
+verbose "\n * Installing celery..."
+loudCmd "$pip_cmd install ${AIRTIMEROOT}/worker"
 # Create the Celery user
 if $is_centos_dist; then
   loudCmd "id celery 2>/dev/null || adduser --no-create-home -c 'LibreTime Celery' -r celery || true"
diff --git a/worker/Makefile b/worker/Makefile
index fccd8ab84..0f5125864 100644
--- a/worker/Makefile
+++ b/worker/Makefile
@@ -1,6 +1,6 @@
 all: lint
 
-include ../../tools/python.mk
+include ../tools/python.mk
 
 PIP_INSTALL := --editable .
 PYLINT_ARG := airtime-celery