epita-std/ACU
Archived
1
0
Fork 0
Code Releases Activity

Use basename instead of full path name

Browse source
This commit is contained in:
Mercier Pierre-Olivier 2013-09-15 15:44:47 +02:00
parent e44db62e10
commit 0d88ff8eb6
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
commands/manage-server.sh
View file

@ -25,6 +25,7 @@ fi
FAIL=0 FAIL=0
for SRV in $SRV_LIST for SRV in $SRV_LIST
do do
echo -e "\e[1;33m>>>\e[0m $ACTION on $SRV" | tee -a "$LOG"
if [ "$ACTION" == "update" ] if [ "$ACTION" == "update" ]
then then
ssh root@$SRV "make -C liblerdorf update upgrade" ssh root@$SRV "make -C liblerdorf update upgrade"
@ -39,10 +40,9 @@ do
echo -e "\e[1;31m>>>\e[0m $ACTION fails on $SRV" | tee -a "$LOG" echo -e "\e[1;31m>>>\e[0m $ACTION fails on $SRV" | tee -a "$LOG"
FAIL=1 FAIL=1
fi fi
echo
done done
echo
cat "$LOG" cat "$LOG"
exit $FAIL exit $FAIL

5
process/ldap/update_group.pl
View file

@ -3,6 +3,7 @@
use v5.10.1; use v5.10.1;
use strict; use strict;
use warnings; use warnings;
use File::Basename;
use Mail::Internet; use Mail::Internet;
use Pod::Usage; use Pod::Usage;
@ -293,11 +294,11 @@ sub process_user
return "Ok"; return "Ok";
} }
if ($0 =~ /^update_group/) { if (basename($0) =~ /^update_group/) {
$_get_type = \&group_get_type; $_get_type = \&group_get_type;
Process::register("update_group", \&process_group); Process::register("update_group", \&process_group);
} }
elsif ($0 =~ /^update_user/) { elsif (basename($0) =~ /^update_user/) {
$_get_type = \&user_get_type; $_get_type = \&user_get_type;
Process::register("update_user", \&process_user); Process::register("update_user", \&process_user);
} }