From 0d88ff8eb60cbb61eb5f625435f86f3f25229a64 Mon Sep 17 00:00:00 2001 From: Mercier Pierre-Olivier Date: Sun, 15 Sep 2013 15:44:47 +0200 Subject: [PATCH] Use basename instead of full path name --- commands/manage-server.sh | 4 ++-- process/ldap/update_group.pl | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/commands/manage-server.sh b/commands/manage-server.sh index 1fc889f..30e0320 100755 --- a/commands/manage-server.sh +++ b/commands/manage-server.sh @@ -25,6 +25,7 @@ fi FAIL=0 for SRV in $SRV_LIST do + echo -e "\e[1;33m>>>\e[0m $ACTION on $SRV" | tee -a "$LOG" if [ "$ACTION" == "update" ] then 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" FAIL=1 fi + echo done -echo - cat "$LOG" exit $FAIL \ No newline at end of file diff --git a/process/ldap/update_group.pl b/process/ldap/update_group.pl index c537e6f..01bdb1b 100644 --- a/process/ldap/update_group.pl +++ b/process/ldap/update_group.pl @@ -3,6 +3,7 @@ use v5.10.1; use strict; use warnings; +use File::Basename; use Mail::Internet; use Pod::Usage; @@ -293,11 +294,11 @@ sub process_user return "Ok"; } -if ($0 =~ /^update_group/) { +if (basename($0) =~ /^update_group/) { $_get_type = \&group_get_type; Process::register("update_group", \&process_group); } -elsif ($0 =~ /^update_user/) { +elsif (basename($0) =~ /^update_user/) { $_get_type = \&user_get_type; Process::register("update_user", \&process_user); }