more pandoc work

dependencies/linux/install-pandoc-debian

@@ -21,14 +21,11 @@ set -e
 INSTALL_DIR=`pwd`
 
 # install system level dependencies
-if [ -x /usr/bin/apt-get ]
-then 
-  sudo apt-get -y install build-essential
-  sudo apt-get -y install libglc-dev
-  sudo apt-get -y install freeglut3-dev
-  sudo apt-get -y install libedit-dev 
-  sudo apt-get -y install libgmp3-dev
-fi
+sudo apt-get -y install build-essential
+sudo apt-get -y install libglc-dev
+sudo apt-get -y install freeglut3-dev
+sudo apt-get -y install libedit-dev 
+sudo apt-get -y install libgmp3-dev
 
 # establish pandoc directory and work there
 PANDOC_DIR=${INSTALL_DIR}/pandoc

dependencies/linux/install-pandoc-rpm

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+#
+# install-pandoc-yum
+#
+# Copyright (C) 2009-12 by RStudio, Inc.
+#
+# Unless you have received this program directly from RStudio pursuant
+# to the terms of a commercial license agreement with RStudio, then
+# this program is licensed to you under the terms of version 3 of the
+# GNU Affero General Public License. This program is distributed WITHOUT
+# ANY EXPRESS OR IMPLIED WARRANTY, INCLUDING THOSE OF NON-INFRINGEMENT,
+# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Please refer to the
+# AGPL (http://www.gnu.org/licenses/agpl-3.0.txt) for more details.
+#
+#
+
+set -e
+
+# install dir
+INSTALL_DIR=`pwd`
+
+# establish pandoc directory and work there
+PANDOC_DIR=${INSTALL_DIR}/pandoc
+mkdir -p ${PANDOC_DIR}
+cd $PANDOC_DIR
+
+# install haskell dependencies
+sudo yum install -y gmp-devel
+sudo yum install -y haskell-platform
+
+# wipe out existing state
+rm -rf ~/.cabal
+rm -rf ~/.ghc
+
+# install latest version of pandoc
+cabal update
+cabal install crypto-cipher-types-0.0.7
+cabal install --flags="embed_data_files" pandoc pandoc-citeproc
+
+
+

dependencies/linux/install-pandoc-rpm-64

@@ -36,7 +36,13 @@ rm ${JUSTHUB}
 # install haskell platform
 sudo yum install -y haskell
 
+# wipe out existing state
+rm -rf ~/.ghc
+rm -rf ~/.cabal
+
 # install pandoc
 CABAL=/usr/bin/cabal
+cabal update
+cabal install crypto-cipher-types-0.0.7
 . ../install-pandoc-src