diff options
| author | Reto Buerki <reet@codelabs.ch> | 2012-12-18 16:44:21 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 16:54:58 +0100 |
| commit | aafc0a179901c8a224e5e473cbab5f13ae7ad134 (patch) | |
| tree | e3cb2296f0bcdec54eb73778111d49cf35f0dfc7 /testing/scripts/build-guestimages | |
| parent | 0593b6c975684d61a7432c6593ef5a5a6bc7b21d (diff) | |
| download | strongswan-aafc0a179901c8a224e5e473cbab5f13ae7ad134.tar.bz2 strongswan-aafc0a179901c8a224e5e473cbab5f13ae7ad134.tar.xz | |
Make test scripts callable from any path
Diffstat (limited to 'testing/scripts/build-guestimages')
| -rwxr-xr-x | testing/scripts/build-guestimages | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages index d07981a17..f5669040e 100755 --- a/testing/scripts/build-guestimages +++ b/testing/scripts/build-guestimages @@ -16,9 +16,11 @@ echo "Creating guest images" -. $PWD/scripts/function.sh +DIR=$(dirname `readlink -f $0`) +. $DIR/../testing.conf +. $DIR/function.sh -HOSTSDIR=$PWD/hosts +HOSTSDIR=$DIR/../hosts [ `id -u` -eq 0 ] || die "You must be root to run $0" [ -f $ROOTIMG ] || die "Root image $ROOTIMG not found" @@ -47,7 +49,7 @@ do if [ "$host" = "winnetou" ] then execute "mkdir $LOOPDIR/var/log/apache2/ocsp" 0 - execute "cp -rf $PWD/images $LOOPDIR/var/www/" 0 + execute "cp -rf $DIR/../images $LOOPDIR/var/www/" 0 execute_chroot "ln -s /etc/openssl/certs /var/www/certs" 0 execute_chroot "/etc/openssl/generate-crl" 0 execute_chroot "update-rc.d apache2 defaults" 0 |