From b5b18d5ca74af90dd3b6eec1ee901b6243b99995 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 31 Jan 2020 11:05:38 +0100
Subject: [PATCH] ajouter le nom de la branche en clair dans le dir_module car
il sert ensuite aussi a nommer le module dans trad.spip.net
---
inc/salvatore.php | 3 +++
1 file changed, 3 insertions(+)
diff --git a/inc/salvatore.php b/inc/salvatore.php
index ec905b8..9ccdcdc 100644
--- a/inc/salvatore.php
+++ b/inc/salvatore.php
@@ -185,6 +185,9 @@ function salvatore_charger_fichier_traductions($fichier_traductions = null){
if (end($d)){
$source = basename(end($d), '.git');
$source = '--' . preg_replace(',[^\w-],', '_', $source);
+ if ($branche and $branche !== 'master') {
+ $source .= "@$branche";
+ }
}
$dir_module = "{$module}{$source}-" . substr(md5("$methode:$url:$branche:$dir"), 0, 5);
$dir_checkout = preg_replace(",\W+,", "-", "$methode-$url") . ($branche ? "--$branche-" : "-") . substr(md5("$methode:$url:$branche"), 0, 5);
--
GitLab