Merge remote-tracking branch 'origin/CRAN' into CRAN

README.md

@@ -99,11 +99,11 @@ numericInput("sm_comp_value", "Comparison value:", state_init('sm_comp_value',sm
 
 Three (related) apps are included in the inst/ directory. `Base`, offers data loading, saving, viewing, visualizing, merging, and transforming tools. The `quant` app sources the code from base and extends it. Finally, the `marketing` app sources the code from `base` and `quant` and extends it with additional tools. The `quant` app focuses on (basic) quantitative analysis (e.g., comparing means, regression, etc.). The `marketing` app focuses on marketing analytics by adding clustering, principle component analysis, conjoint analysis, etc.
 
-## Online
+<!-- ## Online
 
 If you really don't want to install Radiant on your computer (yet) you can tryout the app online at <http://vnijs.rady.ucsd.edu:3838/marketing>. Note that this is a test server only!
 
-
+ -->
 ## License
 
 

build/build_mac_win.sh

@@ -19,15 +19,15 @@ rm $dirmac/radiant*
 rm $dirmac_mav/radiant*
 rm $dirwin/radiant*
 
-# rm $dirsource/shinyAce*
-# rm $dirmac/shinyAce*
-# rm $dirmac_mav/shinyAce*
-# rm $dirwin/shinyAce*
-
-# rm $dirsource/rpivotTable*
-# rm $dirmac/rpivotTable*
-# rm $dirmac_mav/rpivotTable*
-# rm $dirwin/rpivotTable*
+rm $dirsource/shinyAce*
+rm $dirmac/shinyAce*
+rm $dirmac_mav/shinyAce*
+rm $dirwin/shinyAce*
+
+rm $dirsource/rpivotTable*
+rm $dirmac/rpivotTable*
+rm $dirmac_mav/rpivotTable*
+rm $dirwin/rpivotTable*
 
 # build source and mac version
 R --save < build/build_mac_source.R 2>&1

cran-comments.md

@@ -1,15 +1,19 @@
 ## Critical bug-fix
 
-The package version submitted to CRAN has a fatal bug that crashes the Shiny app
-on start-up. The bug is fixed in this submission.
+The package version now on CRAN has a fatal bug that crashes the app on
+start-up. The bug is fixed in this submission. My sincere apologies for the
+inconvenience.
 
+There were no ERRORs or WARNINGs. There was 1 NOTE about a possible misspelling.
 
 ### Test environments
 * local OS X install, R 3.1.2
 * local Windows 8.1.1 install, R 3.1.2
 * ubuntu 12.04 (on travis-ci), R 3.1.2
 * win-builder (devel and release)
 
+## earlier communications
+
 ## Resubmission
 This is a resubmission. In this version I have:
 

inst/base/tools/app/about.md

@@ -99,11 +99,11 @@ numericInput("sm_comp_value", "Comparison value:", state_init('sm_comp_value',sm
 
 Three (related) apps are included in the inst/ directory. `Base`, offers data loading, saving, viewing, visualizing, merging, and transforming tools. The `quant` app sources the code from base and extends it. Finally, the `marketing` app sources the code from `base` and `quant` and extends it with additional tools. The `quant` app focuses on (basic) quantitative analysis (e.g., comparing means, regression, etc.). The `marketing` app focuses on marketing analytics by adding clustering, principle component analysis, conjoint analysis, etc.
 
-## Online
+<!-- ## Online
 
 If you really don't want to install Radiant on your computer (yet) you can tryout the app online at <http://vnijs.rady.ucsd.edu:3838/marketing>. Note that this is a test server only!
 
-
+ -->
 ## License
 
 

inst/base/tools/app/quit.R

@@ -78,7 +78,7 @@ observe({
           # cat(input$rmd_report, file = pipe("pbcopy"))
         }
       }
-      rm(r_env, envir = .GlobalEnv) # removing the reference to the shiny environment
+      try(rm(r_env, envir = .GlobalEnv), silent = TRUE) # removing the reference to the shiny environment
       stopApp(cat(stop_message))
     })
   } else {