From 2c01b367406af8f1157f970dde5c2952d251c5b7 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 23 Mar 2011 20:54:54 +0000 Subject: [PATCH] drop need for argument to "noderun" when building binaries on VMs git-svn-id: svn://localhost/ardour2/branches/3.0@9195 d708f5d6-7413-0410-9779-e7cbd77b26cf --- tools/linux_packaging/noderun | 8 +++----- tools/linux_packaging/run | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/linux_packaging/noderun b/tools/linux_packaging/noderun index f5f5ed4d7f..054a5c9899 100644 --- a/tools/linux_packaging/noderun +++ b/tools/linux_packaging/noderun @@ -1,10 +1,8 @@ #!/bin/sh -BASE=$1 - -if [ x$BASE = "x" ] ; then - exit 1 -fi +BASE=$(readlink -f $0) +BASE=$(dirname $BASE) # up one +BASE=$(dirname $BASE) # up one more if mount | grep --silent vmshare ; then sudo mount -t vboxsf vmshare $HOME/vmshare diff --git a/tools/linux_packaging/run b/tools/linux_packaging/run index 58993a04f1..23bd0149df 100644 --- a/tools/linux_packaging/run +++ b/tools/linux_packaging/run @@ -12,9 +12,7 @@ for VM in Build_32bit_804s Build_64bit_804s ; do sleep 12 echo "$VM: Running $tooldir/noderun $basedir on $VM ... " $vbm guestcontrol exec $VM /bin/sh \ - --arguments -vx \ --arguments $tooldir/noderun \ - --arguments $basedir \ --environment PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \ --username $u --password $p --wait-for stdout status=$?