diff --git a/ACU/t/tinyglob.t b/ACU/t/tinyglob.t index 35f6f7b..4c9fe8f 100644 --- a/ACU/t/tinyglob.t +++ b/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(); diff --git a/commands/first-install.sh b/commands/first-install.sh index 47157b7..ea1d507 100755 --- a/commands/first-install.sh +++ b/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` diff --git a/commands/moulette/launch.sh b/commands/moulette/launch.sh index c591920..e15ad14 100755 --- a/commands/moulette/launch.sh +++ b/commands/moulette/launch.sh @@ -14,10 +14,10 @@ fi if [ "x${1:0:2}" = "x20" ] then - YEAR=" $1" + 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 < moulette -$YEAR + $YEAR $PROJECT_ID $RENDU $LOGINS diff --git a/commands/moulette/sendgit.sh b/commands/moulette/sendgit.sh index 07b92ad..ec68a4c 100755 --- a/commands/moulette/sendgit.sh +++ b/commands/moulette/sendgit.sh @@ -1,8 +1,13 @@ #!/bin/sh -if [ -z "$2" ] +usage() +{ + echo "Usage: $0 [-d] [year] [login ...]" +} + +if [ -z "$3" ] then - echo "Usage: $0 [year] [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=" $1" @@ -24,10 +37,16 @@ RENDU=$2 shift 2 +if [ $# -le 0 ] +then + usage + exit 1 +fi + while [ $# -gt 0 ] do LOGIN=$1 - cat < $YEAR diff --git a/commands/project/gen_git_str.pl b/commands/project/gen_git_str.pl index 0a67688..f49e193 100644 --- a/commands/project/gen_git_str.pl +++ b/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} }; diff --git a/migration/repo.sh b/migration/repo.sh index 23af34c..c8fffa1 100755 --- a/migration/repo.sh +++ b/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 diff --git a/process/files/moulette_get.pl b/process/files/moulette_get.pl index c0312df..1b4bc3c 100644 --- a/process/files/moulette_get.pl +++ b/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);