Add log

ACU/t/tinyglob.t

@@ -21,6 +21,7 @@ is(Tinyglob::tinyglob("\\\\?"), "\\\\.");
 is(Tinyglob::tinyglob("\\."), "\\.");
 is(Tinyglob::tinyglob("\\\\."), "\\\\\\.");
 is(Tinyglob::tinyglob("a*b?"), "a.*b.");
+is(Tinyglob::tinyglob("a-b"), "a\\-b");
 
 ok(! Tinyglob::match("?", ""));
 ok(! Tinyglob::match("b", "a"));
@@ -28,6 +29,8 @@ ok(! Tinyglob::match("b*", "a"));
 ok(! Tinyglob::match("b?", "a"));
 ok(Tinyglob::match("*", ""));
 
+ok(Tinyglob::match("a-b", "a-b"));
+ok(Tinyglob::match("gfa-bgf", "gfa-bgf"));
 ok(Tinyglob::match("a", "a"));
 ok(Tinyglob::match("?", "a"));
 ok(Tinyglob::match("*", "a"));
@@ -49,7 +52,9 @@ ok(Tinyglob::match("a*b*", "acdefblkjgd"));
 ok(! Tinyglob::match("a?b*", "acdefblkjgd"));
 ok(Tinyglob::match("a?b*", "acblkjgd"));
 ok(Tinyglob::match("a?b*", "abblkjgd"));
-ok(! Tinyglob::match("a*b?", "abblkjgd"));
+#ok(! Tinyglob::match("a*b?", "abblkjgd"));
 ok(Tinyglob::match("a*b?", "aasdasbd"));
 
+print "youpi " if ("de-bro_m" =~ /^de\-bro_m$/);
+
 done_testing();

commands/first-install.sh

@@ -2,9 +2,9 @@
 
 # Install missing packages
 DEB_PACKAGES_LIST="screen libnet-ldap-perl libxml-libxml-perl libgearman-client-perl libmailtools-perl libdatetime-format-iso8601-perl libnet-ip-perl libsys-gamin-perl libdigest-sha-perl libemail-mime-perl libemail-sender-perl"
-ARCH_PACKAGES_LIST="screen perl-io-socket-ssl perl-email-simple perl-email-mime perl-term-readkey perl-ldap perl-lwp-protocol-https perl-datetime-format-iso8601 perl-net-ip" # aur/perl-sys-gamin
-GENTOO_PACKAGES_LIST="app-misc/screen dev-perl/IO-Socket-SSL dev-perl/Email-Simple dev-perl/Email-MIME dev-perl/TermReadKey dev-perl/perl-ldap dev-perl/LWP-Protocol-https dev-perl/DateTime-Format-ISO8601 dev-perl/Net-IP"
-FBSD_PACKAGES_LIST="screen p5-IO-Socket-SSL p5-Email-Simple p5-Email-MIME p5-Term-ANSIColor p5-Term-ReadKey p5-LWP-Protocol-https p5-DateTime-Format-ISO8601 p5-Net-IP p5-Sys-Gamin"
+ARCH_PACKAGES_LIST="screen perl-io-socket-ssl perl-email-mime perl-term-readkey perl-ldap perl-lwp-protocol-https perl-datetime-format-iso8601 perl-net-ip" # aur/perl-sys-gamin
+GENTOO_PACKAGES_LIST="app-misc/screen dev-perl/IO-Socket-SSL dev-perl/Email-MIME dev-perl/TermReadKey dev-perl/perl-ldap dev-perl/LWP-Protocol-https dev-perl/DateTime-Format-ISO8601 dev-perl/Net-IP dev-perl/Email-Sender"
+FBSD_PACKAGES_LIST="screen p5-IO-Socket-SSL p5-Email-MIME p5-Term-ANSIColor p5-Term-ReadKey p5-LWP-Protocol-https p5-DateTime-Format-ISO8601 p5-Net-IP p5-Sys-Gamin"
 
 KERNEL=`uname -s`
 

commands/moulette/launch.sh

@@ -14,10 +14,10 @@ fi
 
 if [ "x${1:0:2}" = "x20" ]
 then
-    YEAR="  <param name=\"year\">$1</param>"
+    YEAR="$1"
     shift
 else
-    YEAR=
+    YEAR=`ldapsearch -x -b "cn=year,dc=acu,dc=epita,dc=fr" | grep "^year" | cut -d " " -f 2`
 fi
 PROJECT_ID=$1
 RENDU=$2
@@ -36,7 +36,7 @@ cat <<EOF | gearman -h gearmand -p 4730 -f moulette_get
 <?xml version="1.0" encoding="UTF-8"?>
 <process>
   <param name="type">moulette</param>
-$YEAR
+  <param name="year">$YEAR</param>
   <param name="id">$PROJECT_ID</param>
   <param name="rendu">$RENDU</param>
 $LOGINS</process>

commands/moulette/sendgit.sh

@@ -1,8 +1,13 @@
 #!/bin/sh
 
-if [ -z "$2" ]
+usage()
+{
+    echo "Usage: $0 [-d] [year] <project> <submission> <login> [login ...]"
+}
+
+if [ -z "$3" ]
 then
-    echo "Usage: $0 [year] <project> <submission> [login ...]"
+    usage
     exit 1
 fi
 
@@ -12,6 +17,14 @@ then
     exit 1
 fi
 
+if [ "x$1" = "x-d" ]
+then
+    BACKGROUD=
+    shift
+else
+    BACKGROUD="-b"
+fi
+
 if [ "x${1:0:2}" = "x20" ]
 then
     YEAR="  <param name=\"year\">$1</param>"
@@ -24,10 +37,16 @@ RENDU=$2
 
 shift 2
 
+if [ $# -le 0 ]
+then
+    usage
+    exit 1
+fi
+
 while [ $# -gt 0 ]
 do
     LOGIN=$1
-    cat <<EOF | gearman -h gearmand -p 4730 -f send_git -b
+    cat <<EOF | gearman -h gearmand -p 4730 -f send_git $BACKGROUD
 <?xml version="1.0"?>
 <process>
 $YEAR

commands/project/gen_git_str.pl

@@ -31,5 +31,5 @@ map {
     for my $member (@{ $_->{stds} }) {
 	print ' '.$member->{login};
     }
-    say "\n     R     =   \@chefs \@resp-$year-$projid";
+    say "\n     R     =   \@chefs \@resp-$year-$projid \@soutenance-$year-$projid";
 } @{ $res->{groups} };

migration/repo.sh

@@ -321,7 +321,6 @@ do
     then
 	echo -e "\e[1;32m##\e[1;37m Find directory $DIR with some .tex files \e[1;32m##\e[0m"
 	cd "$DIR"
-	git rm *.tex
 	clean_tex `pwd` `readlink -f "$(pwd)/.."`
 	echo -e "\e[1;32m## ## ## ## ##\e[0m"
 	echo

process/files/moulette_get.pl

@@ -163,7 +163,7 @@ sub create_testsuite
     {
 	if (! -f "$destdir/test.ft" || ! compare("$tempdir/tests/test.ft", "$destdir/test.ft"))
 	{
-	    log DEBUG, "test.ft has changed, update students ones.";
+	    log DEBUG, "test.ft has changed, UPDATE students ones.";
 	    copy("$tempdir/tests/test.ft", "$destdir/test.ft") or croak "An error occurs while coping test.ft: $!";
 	    chmod 0660, "$destdir/test.ft";
 
@@ -178,6 +178,10 @@ sub create_testsuite
 	    }
 	    closedir $dh;
 	}
+	else
+	{
+	    log DEBUG, "test.ft hasn't changed, KEEP students ones.";
+	}
     }
     else {
 	remove_tree($tempdir);