From 988d7e08a08e979b6aac866f92e2d660c7f7e539 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Thu, 22 Sep 2022 06:03:51 +0200 Subject: [PATCH] bundles/travelynx: use carton instead of cpanm --- bundles/travelynx/items.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bundles/travelynx/items.py b/bundles/travelynx/items.py index df07150..dda92cf 100644 --- a/bundles/travelynx/items.py +++ b/bundles/travelynx/items.py @@ -2,7 +2,7 @@ from os.path import isfile, join pkg_apt = { 'perl': {}, - 'cpanminus': {}, + 'carton': {}, } users = { @@ -76,10 +76,10 @@ git_deploy = { actions = { 'travelynx_install_deps': { - 'command': 'cd /opt/travelynx && cpanm -in --no-man-pages --installdeps .', + 'command': 'cd /opt/travelynx && carton install', 'needs': { 'pkg_apt:perl', - 'pkg_apt:cpanminus', + 'pkg_apt:carton', }, 'triggered': True, }, @@ -88,7 +88,7 @@ actions = { # Because git_deploy does not put .git onto the server, the script # will complain on STDERR about not finding a git repository. # That's why we need to redirect stderr to /dev/null. - 'unless': 'cd /opt/travelynx && [ $(perl index.pl database has-current-schema 2>/dev/null) = "yes" ]', + 'unless': 'export PERL5LIB=/opt/travelynx/local/lib/perl5; cd /opt/travelynx && [ $(perl index.pl database has-current-schema 2>/dev/null) = "yes" ]', 'needs': { 'action:travelynx_install_deps', 'file:/opt/travelynx/travelynx.conf',