From e213e2b5dfe0aafc1a4cbb6d7410b646c7fbf002 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 3 May 2012 13:26:43 -0400
Subject: [PATCH] Clean up install scripts

---
 gnomeos/gnomeos-setup.sh                      | 51 -------------------
 .../{gnomeos-install.sh => ostree-install.sh} | 36 +++++--------
 2 files changed, 14 insertions(+), 73 deletions(-)
 delete mode 100755 gnomeos/gnomeos-setup.sh
 rename gnomeos/{gnomeos-install.sh => ostree-install.sh} (77%)

diff --git a/gnomeos/gnomeos-setup.sh b/gnomeos/gnomeos-setup.sh
deleted file mode 100755
index 1e27ea1d..00000000
--- a/gnomeos/gnomeos-setup.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-# -*- indent-tabs-mode: nil; -*-
-# Set up ostree directory
-#
-# Copyright (C) 2011,2012 Colin Walters <walters@verbum.org>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-set -e
-set -x
-
-SRCDIR=`dirname $0`
-WORKDIR=`pwd`
-
-if test $(id -u) != 0; then
-    cat <<EOF
-This script should be run as root.
-EOF
-    exit 1
-fi
-
-usage () {
-    echo "$0 OSTREE_DIR_PATH"
-    exit 1
-}
-
-OSTREE_DIR_PATH=$1
-shift
-test -n "$OSTREE_DIR_PATH" || usage
-
-cd "$OSTREE_DIR_PATH"
-
-mkdir -p modules
-
-if ! test -d repo; then
-    mkdir repo
-    ostree --repo=repo init
-fi
diff --git a/gnomeos/gnomeos-install.sh b/gnomeos/ostree-install.sh
similarity index 77%
rename from gnomeos/gnomeos-install.sh
rename to gnomeos/ostree-install.sh
index c37e25af..cf709c79 100755
--- a/gnomeos/gnomeos-install.sh
+++ b/gnomeos/ostree-install.sh
@@ -1,9 +1,14 @@
 #!/bin/bash
 # -*- indent-tabs-mode: nil; -*-
-# Install OSTree to system
-#
 # Copyright (C) 2011,2012 Colin Walters <walters@verbum.org>
 #
+# Prepare an empty OSTree setup on system; this presently uses the
+# "host" kernel.  This has no impact on the host system.
+# 
+# Note also this script is idempotent - you can run it more than
+# once, and you should in fact do so right now to update to a newer
+# host kernel.
+#
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
@@ -34,29 +39,16 @@ EOF
     exit 1
 fi
 
-usage () {
-    echo "$0 OSTREE_REPO_URL"
-    exit 1
-}
+mkdir -p /ostree
 
-ARCH=i686
-BRANCH_PREFIX="gnomeos-3.4-${ARCH}-"
+cd /ostree
 
-if ! test -d /ostree/repo/objects; then
-    mkdir -p /ostree
+mkdir -p modules
+mkdir -p var
 
-    $SRCDIR/gnomeos-setup.sh /ostree
-
-    cd /ostree
-
-    ostree --repo=repo remote add gnome http://ostree.gnome.org/repo ${BRANCH_PREFIX}{runtime,devel}
-    ostree-pull --repo=repo gnome
-    for branch in runtime devel; do
-        ostree --repo=repo checkout --atomic-retarget ${BRANCH_PREFIX}${branch}
-    done
-    ln -sf ${BRANCH_PREFIX}runtime current
-
-    cd ${WORKDIR}
+if ! test -d repo; then
+    mkdir repo
+    ostree --repo=repo init
 fi
 
 uname=$(uname -r)