From 5572d00013afe4bcd78995680807539f4d513dbb Mon Sep 17 00:00:00 2001
From: Bernhard Gschaider <bgschaid@ice-sf.at>
Date: Mon, 10 Feb 2014 14:22:01 +0100
Subject: [PATCH] Fixes to scripts: - hg updates to the parent revision (for
 cases that use bookmarks instead of branches - recommended when interacting
 with git) - ccache now points to the "external" cache

---
 vagrantSandbox/initGeneralScript.sh |  8 +++++---
 vagrantSandbox/skel/.bashrc         | 10 ++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 vagrantSandbox/skel/.bashrc

diff --git a/vagrantSandbox/initGeneralScript.sh b/vagrantSandbox/initGeneralScript.sh
index 646896d3e..93e2034ae 100755
--- a/vagrantSandbox/initGeneralScript.sh
+++ b/vagrantSandbox/initGeneralScript.sh
@@ -44,10 +44,12 @@ then
 	echo
 	echo "Parent is mercurial. Hello Bernhard"
 	echo
-	branchName=`hg branch -R $OFParent`
+#	branchName=`hg branch -R $OFParent`
+	idName=`hg id -i -R $OFParent | sed -e "s/\+//"`
+	# sed removes + in case of a 'tainted' parent
 
-	echo "Parent is on branch $branchName"
-	su vagrant - -c "hg clone -u $branchName $OFParent $OFClone"
+	echo "Parent is on id $idName"
+	su vagrant - -c "hg clone -u $idName $OFParent $OFClone"
 	echo
     else
 	echo
diff --git a/vagrantSandbox/skel/.bashrc b/vagrantSandbox/skel/.bashrc
new file mode 100644
index 000000000..fd2c4a1bf
--- /dev/null
+++ b/vagrantSandbox/skel/.bashrc
@@ -0,0 +1,10 @@
+# .bashrc
+
+# Source global definitions
+if [ -f /etc/bashrc ]; then
+	. /etc/bashrc
+fi
+
+# User specific aliases and functions
+
+export CCACHE_DIR=/vagrant/ccache4vm