From 14313b1c68a1c068ec841b4ac8aa074f0784267a Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Fri, 18 Jul 2014 16:10:16 +0100 Subject: 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. --- yarns/implementations.yarn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.1