From: Quentin Smith <quentin@mit.edu>
Date: Sat, 6 Mar 2010 05:14:00 +0000 (-0500)
Subject: Changes to make the preview script also run on Darwin
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/sipb-www.git/commitdiff_plain/311a7147a15361750f50e6942cb1fc95f187923b?ds=sidebyside

Changes to make the preview script also run on Darwin
---

diff --git a/generate-preview.sh b/generate-preview.sh
index a50be67..282ac67 100755
--- a/generate-preview.sh
+++ b/generate-preview.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -e -x
 
 export IKIWIKI_PREVIEW_OUTPUT="$1"
 if [ -z "$IKIWIKI_PREVIEW_OUTPUT" ]; then
@@ -13,16 +13,16 @@ srcdir=$(pwd)
 if [ -n "$2" ]; then
     tmpoutdir="$2"
 else
-    tmpdir=`mktemp -d`
-    tmpoutdir=`mktemp -d`
+    tmpdir=`mktemp -d -t tmp.XXXXXXXXXX`
+    tmpoutdir=`mktemp -d -t tmp.XXXXXXXXXX`
     echo "Building ikiwiki source in $tmpdir"
     echo "Building ikiwiki into $tmpoutdir"
     trap 'rm -rf "$tmpdir"; rm -rf "$tmpoutdir"' 0
     cd "$tmpdir"
     (cd "$srcdir/ikiwiki" && tar c .) | (cd "$tmpdir" && tar x)
-    ./Makefile.PL INSTALL_BASE="$tmpoutdir" PREFIX=
+    perl ./Makefile.PL INSTALL_BASE="$tmpoutdir" PREFIX=
     make install --old-file=docwiki
 fi
 cd "$srcdir"
 export IKIWIKI_SHARE="$tmpoutdir/share/ikiwiki"
-"$tmpoutdir"/bin/ikiwiki --setup "$srcdir"/ikiwiki.setup
+perl "$tmpoutdir"/bin/ikiwiki --setup "$srcdir"/ikiwiki.setup