From 1562d2704feed51a4b4909c29b9f697a37185dc0 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Fri, 4 Sep 2015 17:08:29 +0000
Subject: WIP: split me

---
 examples/cross-bootstrap-morph.yaml | 22 ----------------------
 examples/linux-master.yaml          |  2 +-
 examples/linux.yaml.disabled        |  2 +-
 firehose.sh                         | 13 ++++---------
 4 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100644 examples/cross-bootstrap-morph.yaml

diff --git a/examples/cross-bootstrap-morph.yaml b/examples/cross-bootstrap-morph.yaml
deleted file mode 100644
index 64ff00b..0000000
--- a/examples/cross-bootstrap-morph.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: morph
-kind: firehose
-description: |
-  This example is for tracking Morph's master branch.  This way we no longer
-  need to track morph manually for definitions.  This entry updates the morph
-  present in the cross-bootstrap.morph -- deliberately different so that we
-  can see if changes work for normal builds but not cross-bootstrap or
-  vice-versa.
-
-landing:
-  repo: baserock:baserock/definitions
-  baseref: master
-  myref: ct-mcr-1/danielsilverstone/firehose-test-1
-  stratum: cross-bootstrap
-  chunk: morph
-  method: absolute-sha1
-
-tracking:
-  mode: follow-tip
-  ref: refs/heads/master
-
-
diff --git a/examples/linux-master.yaml b/examples/linux-master.yaml
index c2b1af4..bbc3ccb 100644
--- a/examples/linux-master.yaml
+++ b/examples/linux-master.yaml
@@ -7,7 +7,7 @@ description: |
 landing:
   repo: baserock:baserock/definitions
   baseref: master
-  myref: ct-mcr-1/danielsilverstone/firehose-test-1
+  myref: cu010-trove/br6/firehose-test-1
   stratum: bsp-x86_64-generic
   chunk: linux-x86-64-generic
   method: absolute-sha1
diff --git a/examples/linux.yaml.disabled b/examples/linux.yaml.disabled
index 0230bcd..8372b4f 100644
--- a/examples/linux.yaml.disabled
+++ b/examples/linux.yaml.disabled
@@ -20,4 +20,4 @@ tracking:
   # Turn vX.Y-rcZ into vX.Y~rcZ so that versions can be ordered
   transforms:
     - match: (.*)-rc(.*)
-      replacement: $1~rc$2
+      replacement: \1~rc\2
diff --git a/firehose.sh b/firehose.sh
index b6d1e58..8b710ef 100755
--- a/firehose.sh
+++ b/firehose.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 MORPH="${MORPH:-"$(which morph)"}"
 
@@ -6,16 +7,10 @@ BASE="$(dirname "$0")"
 BASE="${BASE:-.}"
 BASE="$(realpath "${BASE}")"
 
-# Currently the only way to get this to work is to hardcode the path of the plugin.
-# Obviously this is not ideal, but until a working method is obtained this remains
-# our best option at present.
-
-MORPH_PLUGIN_PATH="/usr/lib/python2.7/site-packages/firehose-0.1-py2.7.egg/firehose/plugin"
-
-export MORPH_PLUGIN_PATH
-
 PYTHONPATH="${BASE}${PYTHONPATH:+:${PYTHONPATH}}"
-
 export PYTHONPATH
 
+MORPH_PLUGIN_PATH="$(python -c 'from os.path import *; import firehose; print(abspath(dirname(firehose.__file__)))')/plugin"
+export MORPH_PLUGIN_PATH
+
 exec "${MORPH}" firehose "$@"
-- 
cgit v1.2.1