Merge branch 'pc_new_1' into development

Conflicts:
	config.sh

1 files changed, 14 insertions, 17 deletions

diff --git a/kernlab.sh b/kernlab.sh
index 511874b..aad125d 100755
--- a/kernlab.sh
+++ b/kernlab.sh
@@ -32,37 +32,34 @@ echo
 echo "Kernlab ('$LOG')."
 
 R_DONE=false
-mkdir "$KL_DEST" >/dev/null 2>&1
-if [ ! -d "$KL_DEST" ]; then
-  echo "Install directory '$KL_DEST' is not available! Aborting..."
+mkdir "$R_DEST" >/dev/null 2>&1
+if [ ! -d "$R_DEST" ]; then
+  echo "Install directory '$R_DEST' is not available! Aborting..."
   exit 1
 else
-  if ! rmdir "$KL_DEST" >/dev/null 2>&1; then # if not empty this will fail
+  if ! rmdir "$R_DEST" >/dev/null 2>&1; then # if not empty this will fail
     R_DONE=true
   else
-    mkdir "$KL_DEST" >/dev/null 2>&1
+    mkdir "$R_DEST" >/dev/null 2>&1
   fi
 fi
 
 
 if ! $R_DONE; then
-  cd $HOME/tmp
-  URI="http://cran.r-project.org/src/contrib/Archive/kernlab/kernlab_$KL_VER.tar.gz"
-  cmd="$WGET $URI" && run_cmd "$cmd" "Download"
-
-  export R_LIBS="$KL_DEST" # To install non-global
-  cmd="$R CMD INSTALL kernlab_$KL_VER.tar.gz" && run_cmd "$cmd" "Install"
+  export R_LIBS="$R_DEST" # To install non-global
+  cmd="$R CMD BATCH packs.R" && run_cmd "$cmd" "R packages"
+  eval "$cmd"
 fi
 
 
-if [ ! -f $KL_CONF ]; then
+if [ ! -f $R_CONF ]; then
 
-  echo "if echo \"\$R_LIBS\" | grep -v \"$KL_DEST\">/dev/null 2>&1; then export R_LIBS=\"$KL_DEST\"; fi" >> "$KL_CONF"
-  echo "if ! [ -d \"$KL_DEST\" ]; then echo \"\$0: '$KL_DEST' is not a directory!\"; fi" >> "$KL_CONF"
-  echo "R package destination has been stored in '$KL_CONF'."
+  echo "if echo \"\$R_LIBS\" | grep -v \"$R_DEST\">/dev/null 2>&1; then export R_LIBS=\"$R_DEST\"; fi" >> "$R_CONF"
+  echo "if ! [ -d \"$R_DEST\" ]; then echo \"\$0: '$R_DEST' is not a directory!\"; fi" >> "$R_CONF"
+  echo "R package destination has been stored in '$R_CONF'."
 
-  if ! grep "$KL_CONF" $OT_UI_CONF >/dev/null 2>&1 ; then
-    echo ". \"$KL_CONF\"" >> $OT_UI_CONF
+  if ! grep "$R_CONF" $OT_UI_CONF >/dev/null 2>&1 ; then
+    echo ". \"$R_CONF\"" >> $OT_UI_CONF
   fi
 
 fi