Author: brane
Date: Wed Nov 12 05:52:14 2014
New Revision: 1638701
URL: http://svn.apache.org/r1638701
Log:
Tweak the OSX environment configuration script.
[in tools/buildbot/slaves/svn-x64-macosx]
* setenv.sh: Show the full ramdisk file path in the error message.
Check that the ramdisk volume name is non-empty.
Modified:
subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh
Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh?rev=1638701&r1=1638700&r2=1638701&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh Wed Nov 12
05:52:14 2014
@@ -35,7 +35,7 @@
## is the absolute path the parent of this file.
# Modify this to suit your deployment
-environment=$(cd "${scripts}/../tools" && pwd)/environment.sh
+environment=$(cd "${scripts}/.." && pwd)/environment.sh
eval $(${environment})
export PATH
@@ -54,12 +54,16 @@ export LIBTOOL_CONFIG
# scripts.
if [ ! -f "${scripts}/ramdisk" ]; then
- echo "Missing config file: 'ramdisk'"
+ echo "Missing config file: ${scripts}/ramdisk"
exit 1
fi
# Set the name of the RAMdisk volume
volume_name=$(head -1 "${scripts}/ramdisk")
+if [ -z "${volume_name}" ]; then
+ echo "Missing config parameter: RAMdisk volume name"
+ exit 1
+fi
# Set the absolute source path
abssrc=$(pwd)
