From 77315885b903271126ad05899e183eafe48582c6 Mon Sep 17 00:00:00 2001 From: jo Date: Mon, 13 Sep 2021 15:00:31 +0200 Subject: [PATCH] Use pip to install apps on the system --- install | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/install b/install index 9e60dce93..f529daca3 100755 --- a/install +++ b/install @@ -1023,11 +1023,11 @@ if [ ! -d /var/log/airtime ]; then fi verbose "\n * Installing API client..." -loudCmd "$python_bin ${AIRTIMEROOT}/python_apps/api_clients/setup.py install --install-scripts=/usr/bin" +loudCmd "$python_bin" -m pip 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 "$python_bin" -m pip install "${AIRTIMEROOT}/python_apps/pypo" --install-option="--install-scripts=/usr/bin" 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" @@ -1035,7 +1035,7 @@ systemInitInstall libretime-playout "$web_user" verbose "...Done" verbose "\n * Installing airtime-celery..." -loudCmd "$python_bin ${AIRTIMEROOT}/python_apps/airtime-celery/setup.py install" +loudCmd "$python_bin" -m pip install "${AIRTIMEROOT}/python_apps/airtime-celery" # 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" @@ -1051,12 +1051,12 @@ systemInitInstall libretime-celery verbose "...Done" verbose "\n * Installing libretime-analyzer..." -loudCmd "$python_bin ${AIRTIMEROOT}/python_apps/airtime_analyzer/setup.py install --install-scripts=/usr/bin" +loudCmd "$python_bin" -m pip install "${AIRTIMEROOT}/python_apps/airtime_analyzer" --install-option="--install-scripts=/usr/bin" systemInitInstall libretime-analyzer "$web_user" verbose "...Done" verbose "\n * Installing API..." -loudCmd "python3 ${AIRTIMEROOT}/api/setup.py install --install-scripts=/usr/bin" +loudCmd "$python_bin" -m pip install "${AIRTIMEROOT}/api" systemInitInstall libretime-api "$web_user" mkdir -p /etc/airtime sed -e "s@WEB_USER@${web_user}@g" \