From d7705e874f547b5ccdffe2261a5b1a7a8edeb16c Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 24 Feb 2012 11:23:44 -0500
Subject: [PATCH] gnomeos: Some fixes for install script

---
 gnomeos/yocto/gnomeos-install.sh | 3 ++-
 gnomeos/yocto/ostree-setup.sh    | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnomeos/yocto/gnomeos-install.sh b/gnomeos/yocto/gnomeos-install.sh
index bc10b800..2b796bbc 100755
--- a/gnomeos/yocto/gnomeos-install.sh
+++ b/gnomeos/yocto/gnomeos-install.sh
@@ -40,6 +40,8 @@ usage () {
 ARCH=i686
 BRANCH_PREFIX="gnomeos-3.4-${ARCH}-"
 
+cd /ostree
+
 if ! test -d /ostree/repo/objects; then
     mkdir -p /ostree
 
@@ -51,7 +53,6 @@ ostree-pull --repo=repo origin gnomeos-3.4-i686-{runtime,devel}
 
 uname=$(uname -r)
 
-cd /ostree
 for branch in runtime devel; do
     rev=$(ostree --repo=$(pwd)/repo rev-parse ${BRANCH_PREFIX}${branch});
     if ! test -d ${BRANCH_PREFIX}${branch}-${rev}; then
diff --git a/gnomeos/yocto/ostree-setup.sh b/gnomeos/yocto/ostree-setup.sh
index c5c9ec20..bfe8cbfb 100755
--- a/gnomeos/yocto/ostree-setup.sh
+++ b/gnomeos/yocto/ostree-setup.sh
@@ -56,7 +56,7 @@ if ! test -L run; then
     ln -s ../run run
 fi
 
-mkdir ./var/lib/gdm
+mkdir -p ./var/lib/gdm
 chown 2:2 ./var/lib/gdm
 
 touch ./var/shadow
@@ -73,5 +73,7 @@ dbus:*:1:
 gdm:*:2:
 EOF
 
-mkdir repo
-ostree --repo=repo init
+if ! test -d repo; then
+    mkdir repo
+    ostree --repo=repo init
+fi