summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2012-11-27 16:49:56 +0000
committerJonathan Maw <jonathan.maw@codethink.co.uk>2012-11-27 16:49:56 +0000
commit46c9574ac0a9329be74e3604c23acfecc8cf8d42 (patch)
treeea3f667c8de989205ce47700d816190f194006bd
parent0f1602062f1f9515828adb7aff2d9bad354c91d4 (diff)
downloadgenivi-initial-setup-46c9574ac0a9329be74e3604c23acfecc8cf8d42.tar.gz
Fix water bomb if-else statements and miscellaneous tidying
-rwxr-xr-xsetup12
1 files changed, 8 insertions, 4 deletions
diff --git a/setup b/setup
index 2c18176..2a2634b 100755
--- a/setup
+++ b/setup
@@ -23,15 +23,18 @@ mount -a
#Retrieve the staging-filler
if [ -e /src/staging-filler ]
then
-cd /src/staging-filler
-git pull origin master
-cd -
+ cd /src/staging-filler
+ git pull origin master
+ cd -
else
-git clone ssh://git@trove.ducie.codethink.co.uk/ct/genivi/genivi-staging-filler /src/staging-filler
+ git clone ssh://git@trove.ducie.codethink.co.uk/ct/genivi/genivi-staging-filler /src/staging-filler
fi
+
if [ -e /src/staging-filler/water-bomb-x86_64-filler.tar.gz ]
then
+ echo "Water bomb staging-filler already exists"
else
+ echo "Downloading water bomb staging-filler"
wget -P /src/staging-filler http://download.baserock.org/baserock/water-bomb-x86_64-filler.tar.gz
fi
@@ -51,6 +54,7 @@ staging-filler = /src/staging-filler/water-bomb-x86_64-filler.tar.gz, \
trove-host = trove.ducie.codethink.co.uk
trove-prefix = ct/genivi
EOF
+
#Ensure morph uses our morph.conf
ln -s /src/morph.conf $HOME/.morph.conf