From 9a10a5ff263c7e75cc9f4f870f3ade9bfedad9b7 Mon Sep 17 00:00:00 2001 From: mostly-harmless Date: Tue, 17 Mar 2015 16:44:11 -0700 Subject: [PATCH] Cleanup --- README.md | 4 ++-- build/build_mac_win.sh | 18 +++++++++--------- cran-comments.md | 8 ++++++-- inst/base/tools/app/about.md | 4 ++-- inst/base/tools/app/quit.R | 2 +- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index b6ef94769..aa741892a 100644 --- a/README.md +++ b/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 + ## License diff --git a/build/build_mac_win.sh b/build/build_mac_win.sh index 4d4e1cf8f..bb6426ecc 100755 --- a/build/build_mac_win.sh +++ b/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 diff --git a/cran-comments.md b/cran-comments.md index c2c56230d..7094650b9 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,8 +1,10 @@ ## 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 @@ -10,6 +12,8 @@ on start-up. The bug is fixed in this submission. * 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: diff --git a/inst/base/tools/app/about.md b/inst/base/tools/app/about.md index b6ef94769..aa741892a 100644 --- a/inst/base/tools/app/about.md +++ b/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 + ## License diff --git a/inst/base/tools/app/quit.R b/inst/base/tools/app/quit.R index 761c46277..bb5763cd7 100644 --- a/inst/base/tools/app/quit.R +++ b/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 {