[Bugs-r-devel] SF.net SVN: bugs-r:[214] trunk/BRugs/R

[<chr...@us...>]

Revision: 214
          http://bugs-r.svn.sourceforge.net/bugs-r/?rev=214&view=rev
Author:   chris-jackson
Date:     2011-09-01 09:43:58 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
Quote the path to the helper program.

Modified Paths:
--------------
    trunk/BRugs/R/internal.R
    trunk/BRugs/R/windows/zzz.x64.R.in

Modified: trunk/BRugs/R/internal.R
===================================================================
--- trunk/BRugs/R/internal.R	2011-09-01 08:37:10 UTC (rev 213)
+++ trunk/BRugs/R/internal.R	2011-09-01 09:43:58 UTC (rev 214)
@@ -52,7 +52,7 @@
     cmdFile <- paste(tempDir, "cmds.txt", sep="/")
     pkgPath <- searchpaths()[search()=="package:BRugs"]
     bugsPath <- paste(pkgPath, "/exec/BugsHelper", sep="")
-    shcmd <- paste(bugsPath, dquote(tempDir), dquote(trashDir), dquote(extFile), dquote(cmdFile), dquote(ncmds))
+    shcmd <- paste(dquote(bugsPath), dquote(tempDir), dquote(trashDir), dquote(extFile), dquote(cmdFile), dquote(ncmds))
     for (i in 1:ncmds) {
         if (cmdtypes[i] %in% c("CharArray","RealArray"))
             cat(args[[i]], file=paste(tempDir, "/input",i,".txt", sep=""))
@@ -92,15 +92,15 @@
 
 .SamplesGlobalsCmd <- function(node){
     options.old <- options()
-    options(scipen=20) # don't pass numbers in scientific notation to OpenBUGS 
+    options(scipen=20) # don't pass numbers in scientific notation to OpenBUGS
     commands <- c(paste("SamplesEmbed.beg :=", getOption("BRugsSamplesBeg")),
                   paste("SamplesEmbed.end :=", getOption("BRugsSamplesEnd")),
                   paste("SamplesEmbed.firstChain :=", getOption("BRugsSamplesFirstChain")),
                   paste("SamplesEmbed.lastChain :=", getOption("BRugsSamplesLastChain")),
                   paste("SamplesEmbed.thin :=", getOption("BRugsSamplesThin")),
                   paste("SamplesEmbed.SetVariable(", sQuote(node), ")", sep=""),
-                  paste("BugsMappers.SetPrec(", getOption("BRugsPrec"), ")", sep="")                  
+                  paste("BugsMappers.SetPrec(", getOption("BRugsPrec"), ")", sep="")
                   )
     options(options.old)
-    paste(commands, collapse="; ") 
+    paste(commands, collapse="; ")
 }

Modified: trunk/BRugs/R/windows/zzz.x64.R.in
===================================================================
--- trunk/BRugs/R/windows/zzz.x64.R.in	2011-09-01 08:37:10 UTC (rev 213)
+++ trunk/BRugs/R/windows/zzz.x64.R.in	2011-09-01 09:43:58 UTC (rev 214)
@@ -14,8 +14,8 @@
         ob <- findOpenBUGS()
         msg <- paste("Welcome to BRugs connected to OpenBUGS")
         if (!is.na(ob$version))
-            msg <- paste(msg, " version ", ob$version)
-        else msg <- paste(msg, " in directory ", ob$dir)
+            msg <- paste(msg, "version", ob$version)
+        else msg <- paste(msg, "in directory", ob$dir)
         packageStartupMessage(msg)
     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.