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
This commit is contained in:
parent
20d25e610c
commit
5572d00013
2 changed files with 15 additions and 3 deletions
|
@ -44,10 +44,12 @@ then
|
||||||
echo
|
echo
|
||||||
echo "Parent is mercurial. Hello Bernhard"
|
echo "Parent is mercurial. Hello Bernhard"
|
||||||
echo
|
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"
|
echo "Parent is on id $idName"
|
||||||
su vagrant - -c "hg clone -u $branchName $OFParent $OFClone"
|
su vagrant - -c "hg clone -u $idName $OFParent $OFClone"
|
||||||
echo
|
echo
|
||||||
else
|
else
|
||||||
echo
|
echo
|
||||||
|
|
10
vagrantSandbox/skel/.bashrc
Normal file
10
vagrantSandbox/skel/.bashrc
Normal file
|
@ -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
|
Reference in a new issue