From 8406d08b774096a8448c810e5e4ab4c591f847bc Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 18 Nov 2014 15:38:17 +0000 Subject: [PATCH] make it work on non-BSD-ish systems Fixes #199 --- bin/merge-into-gh-pages | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/merge-into-gh-pages b/bin/merge-into-gh-pages index a21a6f1e..1f2e1494 100755 --- a/bin/merge-into-gh-pages +++ b/bin/merge-into-gh-pages @@ -1,9 +1,9 @@ -#! /bin/sh +#! /bin/bash set -e MERGE_ARGS="-X subtree=site" -merge_dir=$(mktemp -d -t weave-merge)/weave +merge_dir=$(mktemp -d -t weave-merge.XXXXXX)/weave git clone -b gh-pages . $merge_dir pushd $merge_dir