summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@gmail.com>2014-07-18 16:10:16 +0100
committerRichard Maw <richard.maw@codethink.co.uk>2014-07-22 15:55:26 +0100
commit14313b1c68a1c068ec841b4ac8aa074f0784267a (patch)
treebf5e33bc24eeadea1d2e0a7b7f1d7faff420eb54
parent4be1620dca24d539573027831b65ffc040bc1ebb (diff)
downloadmorph-14313b1c68a1c068ec841b4ac8aa074f0784267a.tar.gz
Use run_morph in yarns
This is required to ensure the right version of morph is used. I have a .bashrc that causes `morph` to be "$HOME/morph/morph", so it fails to find morph, because HOME is set to a directory inside DATADIR.
-rw-r--r--yarns/implementations.yarn2
1 files changed, 1 insertions, 1 deletions
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index d32bfd61..f0b5c80a 100644
--- a/yarns/implementations.yarn
+++ b/yarns/implementations.yarn
@@ -441,7 +441,7 @@ architecture as the machine doing the testing. This uses `morph
print-architecture` to get a value appropriate for morph.
IMPLEMENTS WHEN the user creates an uncommitted system morphology called (\S+) for our architecture in system branch (\S+)
- arch=$(morph print-architecture)
+ arch=$(run_morph print-architecture)
name="$(basename "${MATCH_1%.*}")"
install -m644 -D /dev/stdin << EOF "$DATADIR/workspace/$MATCH_2/test/morphs/$MATCH_1"
arch: $arch