[Sciviews-commits] r542 - in pkg/svKomodo: . R inst man

[noreply at r-forge.r-project.org]

Author: phgrosjean
Date: 2014-01-06 15:47:13 +0100 (Mon, 06 Jan 2014)
New Revision: 542

Modified:
   pkg/svKomodo/DESCRIPTION
   pkg/svKomodo/NEWS
   pkg/svKomodo/R/svKomodo-internal.R
   pkg/svKomodo/inst/NEWS.Rd
   pkg/svKomodo/man/svKomodo-package.Rd
Log:
svKomodo: no more dependencies to a specific Unix/Linux 'locate'

Modified: pkg/svKomodo/DESCRIPTION
===================================================================
--- pkg/svKomodo/DESCRIPTION	2013-12-11 16:03:40 UTC (rev 541)
+++ pkg/svKomodo/DESCRIPTION	2014-01-06 14:47:13 UTC (rev 542)
@@ -1,7 +1,7 @@
 Package: svKomodo
 Type: Package
-Version: 0.9-60
-Date: 2013-02-11
+Version: 0.9-61
+Date: 2014-01-06
 Title: SciViews GUI API - Functions to interface with Komodo Edit/IDE
 Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"),
   email = "phgrosjean at sciviews.org"))

Modified: pkg/svKomodo/NEWS
===================================================================
--- pkg/svKomodo/NEWS	2013-12-11 16:03:40 UTC (rev 541)
+++ pkg/svKomodo/NEWS	2014-01-06 14:47:13 UTC (rev 542)
@@ -1,5 +1,11 @@
 = svKomodo News
 
+== Changes in svKomodo 0.9-61
+
+* Simplification of internal code to get Komodo location. It does not require
+  a specific version of 'locate' on Unix/Linux any more.
+
+
 == Changes in svKomodo 0.9-60
 
 * .onAttach() is reworked for not issuing warning messages in Mac OS X.

Modified: pkg/svKomodo/R/svKomodo-internal.R
===================================================================
--- pkg/svKomodo/R/svKomodo-internal.R	2013-12-11 16:03:40 UTC (rev 541)
+++ pkg/svKomodo/R/svKomodo-internal.R	2014-01-06 14:47:13 UTC (rev 542)
@@ -152,26 +152,11 @@
 	if (.Platform$OS.type == "unix") {
 		if (Komodo == "")
 			Komodo <- "/usr/local/bin/komodo"  # Default location
-		if (!file.exists(Komodo)) {
+		if (!file.exists(Komodo))
 			Komodo <- Sys.which("komodo")[1]
-			#debugMsg("which", "returned", Komodo)
-		}
-		
-		if (length(Komodo) == 0 || Komodo == "") {
-			if (!isMac()) {
-				isLocate <- suppressWarnings(length(system('which locate',
-						intern = TRUE)) > 0)
-				if (!isLocate) { # locate is not there
-					Komodo <- NULL
-				} else {
-					Komodo <- try(suppressWarnings(system(
-						"locate --basename -e --regex ^komodo$ | grep -vF 'INSTALLDIR' | grep -F 'bin/komodo' | tail --lines=1",
-						intern = TRUE, ignore.stderr = TRUE)), silent = TRUE)
-					if (inherits(Komodo, "try-error")) Komodo <- NULL
-					#debugMsg("locate komodo", "returned", Komodo)
-				}
-			} else Komodo <- NULL
-		}
+		if (length(Komodo) == 0 || Komodo == "")
+			Komodo <- NULL
+			
 		## Just to avoid warnings while compiling outside of Windows...
 		readRegistry <- function() return()
 	} else {  # Windows

Modified: pkg/svKomodo/inst/NEWS.Rd
===================================================================
--- pkg/svKomodo/inst/NEWS.Rd	2013-12-11 16:03:40 UTC (rev 541)
+++ pkg/svKomodo/inst/NEWS.Rd	2014-01-06 14:47:13 UTC (rev 542)
@@ -1,9 +1,16 @@
 \name{NEWS}
 \title{NEWS file for the svKomodo package}
 
+\section{Changes in version 0.9-61}{
+  \itemize{
+    \item{ Simplification of internal code to get Komodo location. It does not require
+        a specific version of \code{locate} on Unix/Linux any more. }
+  }
+}
+
 \section{Changes in version 0.9-60}{
   \itemize{
-    \item{ You must start Komodo Edit for browsing files. }
+    \item{ \code{.onAttach()} is reworked for not issuing warning messages in Mac OS X. }
   }
 }
 

Modified: pkg/svKomodo/man/svKomodo-package.Rd
===================================================================
--- pkg/svKomodo/man/svKomodo-package.Rd	2013-12-11 16:03:40 UTC (rev 541)
+++ pkg/svKomodo/man/svKomodo-package.Rd	2014-01-06 14:47:13 UTC (rev 542)
@@ -13,8 +13,8 @@
   \tabular{ll}{
     Package: \tab svKomodo\cr
     Type: \tab Package\cr
-    Version: \tab 0.9-60\cr
-    Date: \tab 2013-02-11\cr
+    Version: \tab 0.9-61\cr
+    Date: \tab 2014-01-06\cr
     License: \tab GPL 2 or above, at your convenience\cr
   }
   % TODO: add description of main functions here. Also add examples