Patch for FreeBSD
This commit is contained in:
parent
672740685c
commit
b951c4dc04
3 changed files with 35 additions and 12 deletions
|
|
@ -5,6 +5,7 @@ package LDAP;
|
||||||
use v5.10.1;
|
use v5.10.1;
|
||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
|
use Carp;
|
||||||
|
|
||||||
use Net::LDAPS;
|
use Net::LDAPS;
|
||||||
use Net::LDAP::Util qw(ldap_error_text);
|
use Net::LDAP::Util qw(ldap_error_text);
|
||||||
|
|
|
||||||
18
Makefile
18
Makefile
|
|
@ -1,12 +1,12 @@
|
||||||
COPY=cp -v
|
COPY?=cp -v
|
||||||
DEST=/usr/local/share/perl/`ls -1 /usr/lib/perl/ | tail -1`/
|
DEST?=/usr/local/share/perl/`ls -1 /usr/lib/perl/ | tail -1`/
|
||||||
GIT=/usr/bin/git
|
GIT?=/usr/bin/git
|
||||||
GITOLITE_DEST=/usr/share/gitolite/hooks/common
|
GITOLITE_DEST?=/usr/share/gitolite/hooks/common
|
||||||
MAKEDIR=mkdir
|
MAKEDIR?=mkdir
|
||||||
PROVER=prove -f
|
PROVER?=prove -f
|
||||||
RM=rm
|
RM?=rm
|
||||||
TESTDIR=t
|
TESTDIR?=t
|
||||||
SHELL=/bin/sh
|
SHELL?=/bin/sh
|
||||||
|
|
||||||
launch:
|
launch:
|
||||||
$(SHELL) ./process/launch.sh
|
$(SHELL) ./process/launch.sh
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ cd $(dirname "$0")
|
||||||
|
|
||||||
WKS_LIST="apl"
|
WKS_LIST="apl"
|
||||||
SRV_LIST="moore noyce hamano cpp"
|
SRV_LIST="moore noyce hamano cpp"
|
||||||
|
SCP_LIST="ksh"
|
||||||
|
|
||||||
KNOWN_ACTIONS="start stop restart update log viewlog view_log"
|
KNOWN_ACTIONS="start stop restart update log viewlog view_log"
|
||||||
|
|
||||||
|
|
@ -27,7 +28,7 @@ do
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
for DEST in $WKS_LIST $SRV_LIST
|
for DEST in $WKS_LIST $SRV_LIST $SCP_LIST
|
||||||
do
|
do
|
||||||
if [ -n "$1" ] && [ "$1" == "$DEST" ]
|
if [ -n "$1" ] && [ "$1" == "$DEST" ]
|
||||||
then
|
then
|
||||||
|
|
@ -63,7 +64,7 @@ fi
|
||||||
|
|
||||||
if [ -z "$DESTS" ]
|
if [ -z "$DESTS" ]
|
||||||
then
|
then
|
||||||
DESTS="$SRV_LIST $WKS_LIST"
|
DESTS="$SRV_LIST $WKS_LIST $SCP_LIST"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
OPTIONS=
|
OPTIONS=
|
||||||
|
|
@ -81,7 +82,28 @@ do
|
||||||
echo -e "\e[1;34m>>>\e[0m \e[33m$ACTION\e[0m on \e[1m$DEST\e[0m"
|
echo -e "\e[1;34m>>>\e[0m \e[33m$ACTION\e[0m on \e[1m$DEST\e[0m"
|
||||||
if [ "$ACTION" == "update" ]
|
if [ "$ACTION" == "update" ]
|
||||||
then
|
then
|
||||||
ssh root@$DEST "make -C liblerdorf update upgrade"
|
SCP=0
|
||||||
|
for D in $SCP_LIST
|
||||||
|
do
|
||||||
|
if [ $D == $DEST ]
|
||||||
|
then
|
||||||
|
SCP=1
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ $SCP -eq 0 ]
|
||||||
|
then
|
||||||
|
ssh root@$DEST "make -C liblerdorf update upgrade"
|
||||||
|
else
|
||||||
|
cd ..
|
||||||
|
git archive -o ./liblerdorf.tbz2 master
|
||||||
|
scp ./liblerdorf.tbz2 root@$DEST:
|
||||||
|
cd -
|
||||||
|
ssh root@$DEST mkdir -p liblerdorf
|
||||||
|
ssh root@$DEST tar xf ./liblerdorf.tbz2 -C liblerdorf
|
||||||
|
ssh root@$DEST "DEST=/usr/local/lib/perl5/5.14/ACU make -C liblerdorf upgrade"
|
||||||
|
fi
|
||||||
elif [ "$ACTION" == "log" ] || [ "$ACTION" == "viewlog" ] || [ "$ACTION" == "view_log" ]
|
elif [ "$ACTION" == "log" ] || [ "$ACTION" == "viewlog" ] || [ "$ACTION" == "view_log" ]
|
||||||
then
|
then
|
||||||
ssh root@$DEST '~'/liblerdorf/process/view_log.sh $OPTIONS
|
ssh root@$DEST '~'/liblerdorf/process/view_log.sh $OPTIONS
|
||||||
|
|
|
||||||
Reference in a new issue