Archived
1
0
Fork 0

Merge branch 'master' of ssh://cpp/liblerdorf

This commit is contained in:
Root Cpp Charlie 2013-10-02 22:02:48 +02:00
commit 4c53e2ad06

View file

@ -13,14 +13,14 @@ launch_screen()
CMD=$2 CMD=$2
if [ -n "$3" ] && [ -f "$3" ] if [ -n "$3" ] && [ -f "$3" ]
then then
TMP=`$SU -c 'mktemp' intradmin` TMP=`echo mktemp | $SU intradmin`
$SU -c "killall ssh-agent" intradmin echo "killall ssh-agent" | $SU intradmin
$SU -c "ssh-agent" intradmin > "$TMP" echo "ssh-agent" | $SU intradmin > "$TMP"
$SU -c ". $TMP; ssh-add '$3'" intradmin echo ". $TMP; ssh-add '$3'" | $SU intradmin
CMD=". $TMP; ssh-add -l; echo; $CMD" CMD=". $TMP; ssh-add -l; echo; $CMD"
fi fi
$SU -c "$SCREEN -S '$1' -d -m bash -c '$CMD'" intradmin echo "$SCREEN -S '$1' -d -m bash -c '$CMD'" | $SU intradmin
if [ -f "$TMP" ] if [ -f "$TMP" ]
then then
@ -46,11 +46,11 @@ fi
if [ "$ACTION" = "stop" ] || [ "$ACTION" = "restart" ] if [ "$ACTION" = "stop" ] || [ "$ACTION" = "restart" ]
then then
# Kill old liblersorf screen sessions # Kill old liblersorf screen sessions
$SU -c "$SCREEN -ls" intradmin | $GREP '[0-9]+\.lerdorf_[a-zA-Z0-9_-]+' | echo "$SCREEN -ls" intradmin | $GREP '[0-9]+\.lerdorf_[a-zA-Z0-9_-]+' | $SU |
while read LINE while read LINE
do do
SNAME=`echo $LINE | $SED "s/^[^0-9]*([0-9]+\.[^ \t]+).*$/\1/"` SNAME=`echo $LINE | $SED "s/^[^0-9]*([0-9]+\.[^ \t]+).*$/\1/"`
$SU -c "$SCREEN -S \"$SNAME\" -X kill" intradmin echo "$SCREEN -S \"$SNAME\" -X kill" | $SU intradmin
done done
fi fi