From 1f52c35bd68ff3e9f4868f6901cf21c5e9927f31 Mon Sep 17 00:00:00 2001 From: Mercier Pierre-Olivier Date: Mon, 30 Sep 2013 10:52:58 +0200 Subject: [PATCH 1/2] Fix migration script --- migration/repo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/repo.sh b/migration/repo.sh index 46dd4f0..695fdf1 100755 --- a/migration/repo.sh +++ b/migration/repo.sh @@ -44,7 +44,7 @@ clean_tex() sed -Ei 's/\\verb ([^+]+) /\\verb+\1+/g' "$i" # Special macros - sed -Ei 's/\\(file|email|command) *\{([^}]+)}/\\verb+\1+/gi' "$i" + sed -Ei 's/\\(file|email|command) *\{([^{]*\{[^}]*\})*([^}]*)}/\\verb+\2\3+/gi' "$i" sed -Ei 's/\\begin *\{assistant\}/\\verb+%%assistant-begin+/g' "$i" sed -Ei 's/\\end *\{assistant\}/\\verb+%%assistant-end+/g' "$i" From 4ae0d9f6e02006fa1dff2219d846781dd68c1985 Mon Sep 17 00:00:00 2001 From: Mercier Pierre-Olivier Date: Mon, 30 Sep 2013 10:53:21 +0200 Subject: [PATCH 2/2] Add debug information in gl-pre-git hook --- hooks/gl-pre-git | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hooks/gl-pre-git b/hooks/gl-pre-git index 581494a..62d352e 100755 --- a/hooks/gl-pre-git +++ b/hooks/gl-pre-git @@ -9,11 +9,14 @@ use Net::IP; use ACU::Log; $ACU::Log::log_file = "/var/log/hooks/" . basename($0) . ".log"; +my $ip = $1 if ($ENV{'SSH_CLIENT'} =~ m/([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/); + +log DEBUG, "Connection to $ENV{GL_REPO} from $ip"; + # First, check if the repository is in the YYYY/ directory exit 0 if ($ENV{GL_REPO} !~ /^2[0-9]{3}\/.+\/.+/); -my $ip = $1 if ($ENV{'SSH_CLIENT'} =~ m/([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/); say "Votre IP est : $ip."; $ip = Net::IP->new($ip) or die ("IP invalide");