From 128728ddb4f512e32452eb5a7a9f8c563c8145b4 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 9 Nov 2009 03:09:20 +0000 Subject: [PATCH] fix scriptlet noise caused by 2.10.0 search index changes --- R-make-search-index.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/R-make-search-index.sh b/R-make-search-index.sh index 94440c2..069d1a9 100755 --- a/R-make-search-index.sh +++ b/R-make-search-index.sh @@ -1,5 +1,16 @@ #!/bin/bash +# Determine R versions +R_SUPER_VERSION=`R --version | grep "R version" | cut -d " " -f 3 | cut -d "." -f 1` +R_MAJOR_VERSION=`R --version | grep "R version" | cut -d " " -f 3 | cut -d "." -f 2` + +# If R 3.0.* ever comes out, we'll need to revisit this logic. +# Or, just nuke this script and the macros entirely. +if [ "$R_SUPER_VERSION" -ge "2" -a "$R_MAJOR_VERSION" -ge "10" ]; then + # echo "R is new enough to not need this anymore." + exit 0 +else + # Figure out what RHOME is set to TMP_R_HOME=`R RHOME` @@ -17,5 +28,7 @@ cat /usr/share/R/library/*/CONTENTS >> $TMP_R_DOC_DIR/html/search/index.txt 2>/d # Don't use .. based paths, substitute /usr/share/R sed -i "s!../../..!/usr/share/R!g" $TMP_R_DOC_DIR/html/search/index.txt +fi + exit 0