From d5fb600ac21ac022d2d61a99a567c4abbab5eaa9 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <brad@danga.com>
Date: Mon, 2 Jun 2014 15:55:10 +0900
Subject: [PATCH] Better demo setup

Change-Id: I61e55e3773e30332e6a7d3b426090fbe946a2462
---
 config/dev-client-dir-demo/client-config.json | 12 ++++++++++++
 dev/demo.sh                                   | 15 ++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 config/dev-client-dir-demo/client-config.json

diff --git a/config/dev-client-dir-demo/client-config.json b/config/dev-client-dir-demo/client-config.json
new file mode 100644
index 000000000..8ee1dd3c9
--- /dev/null
+++ b/config/dev-client-dir-demo/client-config.json
@@ -0,0 +1,12 @@
+{
+	"servers": {
+		"devcam": {
+			"server": "http://localhost:3179/",
+			"auth": "devauth:camli3179",
+			"default": true
+		}
+	},
+	"ignoredFiles": [".DS_Store"],
+	"identity": "26F5ABDA",
+	"identitySecretRing": ["_env", "${HOME}/src/camlistore.org/pkg/jsonsign/testdata/test-secring.gpg"]
+}
diff --git a/dev/demo.sh b/dev/demo.sh
index e5577101c..37179f5d7 100644
--- a/dev/demo.sh
+++ b/dev/demo.sh
@@ -4,10 +4,15 @@
 # still permit using the dev-* scripts (which are normally slow and
 # noisy)
 
-go run make.go
-go install camlistore.org/dev/devcam
-export CAMLI_QUIET=1
-export CAMLI_FAST_DEV=1
+#go run make.go
+#go install camlistore.org/dev/devcam
+#export CAMLI_QUIET=1
+#export CAMLI_FAST_DEV=1
 
-#Or just:
+# Or just:
+# (This way is buggy in that the server selection doesn't let you also
+# pick an identity)
 # export CAMLI_DEFAULT_SERVER=dev
+
+# Better:
+export CAMLI_CONFIG_DIR=$HOME/src/camlistore.org/config/dev-client-dir-demo