From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 16 Aug 2004 14:31:09 +0000 (+0000)
Subject: - run an ssh-agent that can hold both the pup-cvs key as well as the
X-Git-Tag: planetlab-2_0-branch-point~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8a3757d32a4265eae57f255e6523bc4448ba8fdd;p=build.git

- run an ssh-agent that can hold both the pup-cvs key as well as the
  build@planet-lab.org key (usually handled interactively by build's
  ~/.bash_profile)
---

diff --git a/build.sh b/build.sh
index f6ee6ed8..9097e5e2 100755
--- a/build.sh
+++ b/build.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/usr/bin/ssh-agent /bin/bash
 #
 # PlanetLab release build script. Intended to be used by scripts and
 # crontabs to build nightly releases (default). Can also be invoked
 # manually to build a tagged release (-r) in the current directory.
 #
-# $Id: build.sh,v 1.6 2004/08/05 22:43:51 mlh-pl_rpm Exp $
+# $Id: build.sh,v 1.7 2004/08/09 15:13:59 mlh-pl_rpm Exp $
 #
 
 # Set defaults
@@ -50,6 +50,11 @@ while ! mkdir ${BASE}${i} 2>/dev/null ; do
 done
 BASE=${BASE}${i}
 
+# XXX Hack to store the pup key as well as the bui key
+for i in `grep -l "BEGIN.*PRIVATE KEY" $HOME/.ssh/*` ; do
+    SSH_ASKPASS=/bin/false ssh-add $i
+done
+
 # Build
 (
 cvs -d ${CVSROOT} export -r ${TAG} -d ${BASE} ${MODULE}