diff --git a/R/runapp.R b/R/runapp.R index af3103d053..10049dd310 100644 --- a/R/runapp.R +++ b/R/runapp.R @@ -468,7 +468,7 @@ runExample <- function(example=NA, host=getOption('shiny.host', '127.0.0.1'), display.mode=c("auto", "normal", "showcase")) { legacy <- getOption('shiny.legacy.examples', FALSE) - examplesDir <- if (isTRUE(legacy)) 'examples' else 'shiny' + examplesDir <- if (isTRUE(legacy)) 'examples' else 'examples-shiny' examplesDir <- system_file(examplesDir, package='shiny') dir <- resolve(examplesDir, example) if (is.null(dir)) { diff --git a/inst/shiny/01_hello/DESCRIPTION b/inst/examples-shiny/01_hello/DESCRIPTION similarity index 100% rename from inst/shiny/01_hello/DESCRIPTION rename to inst/examples-shiny/01_hello/DESCRIPTION diff --git a/inst/shiny/01_hello/Readme.md b/inst/examples-shiny/01_hello/Readme.md similarity index 100% rename from inst/shiny/01_hello/Readme.md rename to inst/examples-shiny/01_hello/Readme.md diff --git a/inst/shiny/01_hello/app.R b/inst/examples-shiny/01_hello/app.R similarity index 100% rename from inst/shiny/01_hello/app.R rename to inst/examples-shiny/01_hello/app.R diff --git a/inst/shiny/02_text/DESCRIPTION b/inst/examples-shiny/02_text/DESCRIPTION similarity index 100% rename from inst/shiny/02_text/DESCRIPTION rename to inst/examples-shiny/02_text/DESCRIPTION diff --git a/inst/shiny/02_text/Readme.md b/inst/examples-shiny/02_text/Readme.md similarity index 100% rename from inst/shiny/02_text/Readme.md rename to inst/examples-shiny/02_text/Readme.md diff --git a/inst/shiny/02_text/app.R b/inst/examples-shiny/02_text/app.R similarity index 100% rename from inst/shiny/02_text/app.R rename to inst/examples-shiny/02_text/app.R diff --git a/inst/shiny/03_reactivity/DESCRIPTION b/inst/examples-shiny/03_reactivity/DESCRIPTION similarity index 100% rename from inst/shiny/03_reactivity/DESCRIPTION rename to inst/examples-shiny/03_reactivity/DESCRIPTION diff --git a/inst/shiny/03_reactivity/Readme.md b/inst/examples-shiny/03_reactivity/Readme.md similarity index 100% rename from inst/shiny/03_reactivity/Readme.md rename to inst/examples-shiny/03_reactivity/Readme.md diff --git a/inst/shiny/03_reactivity/app.R b/inst/examples-shiny/03_reactivity/app.R similarity index 100% rename from inst/shiny/03_reactivity/app.R rename to inst/examples-shiny/03_reactivity/app.R diff --git a/inst/shiny/04_mpg/DESCRIPTION b/inst/examples-shiny/04_mpg/DESCRIPTION similarity index 100% rename from inst/shiny/04_mpg/DESCRIPTION rename to inst/examples-shiny/04_mpg/DESCRIPTION diff --git a/inst/shiny/04_mpg/Readme.md b/inst/examples-shiny/04_mpg/Readme.md similarity index 100% rename from inst/shiny/04_mpg/Readme.md rename to inst/examples-shiny/04_mpg/Readme.md diff --git a/inst/shiny/04_mpg/app.R b/inst/examples-shiny/04_mpg/app.R similarity index 100% rename from inst/shiny/04_mpg/app.R rename to inst/examples-shiny/04_mpg/app.R diff --git a/inst/shiny/05_sliders/DESCRIPTION b/inst/examples-shiny/05_sliders/DESCRIPTION similarity index 100% rename from inst/shiny/05_sliders/DESCRIPTION rename to inst/examples-shiny/05_sliders/DESCRIPTION diff --git a/inst/shiny/05_sliders/Readme.md b/inst/examples-shiny/05_sliders/Readme.md similarity index 100% rename from inst/shiny/05_sliders/Readme.md rename to inst/examples-shiny/05_sliders/Readme.md diff --git a/inst/shiny/05_sliders/app.R b/inst/examples-shiny/05_sliders/app.R similarity index 100% rename from inst/shiny/05_sliders/app.R rename to inst/examples-shiny/05_sliders/app.R diff --git a/inst/shiny/06_tabsets/DESCRIPTION b/inst/examples-shiny/06_tabsets/DESCRIPTION similarity index 100% rename from inst/shiny/06_tabsets/DESCRIPTION rename to inst/examples-shiny/06_tabsets/DESCRIPTION diff --git a/inst/shiny/06_tabsets/Readme.md b/inst/examples-shiny/06_tabsets/Readme.md similarity index 100% rename from inst/shiny/06_tabsets/Readme.md rename to inst/examples-shiny/06_tabsets/Readme.md diff --git a/inst/shiny/06_tabsets/app.R b/inst/examples-shiny/06_tabsets/app.R similarity index 100% rename from inst/shiny/06_tabsets/app.R rename to inst/examples-shiny/06_tabsets/app.R diff --git a/inst/shiny/07_widgets/DESCRIPTION b/inst/examples-shiny/07_widgets/DESCRIPTION similarity index 100% rename from inst/shiny/07_widgets/DESCRIPTION rename to inst/examples-shiny/07_widgets/DESCRIPTION diff --git a/inst/shiny/07_widgets/Readme.md b/inst/examples-shiny/07_widgets/Readme.md similarity index 100% rename from inst/shiny/07_widgets/Readme.md rename to inst/examples-shiny/07_widgets/Readme.md diff --git a/inst/shiny/07_widgets/app.R b/inst/examples-shiny/07_widgets/app.R similarity index 100% rename from inst/shiny/07_widgets/app.R rename to inst/examples-shiny/07_widgets/app.R diff --git a/inst/shiny/08_html/DESCRIPTION b/inst/examples-shiny/08_html/DESCRIPTION similarity index 100% rename from inst/shiny/08_html/DESCRIPTION rename to inst/examples-shiny/08_html/DESCRIPTION diff --git a/inst/shiny/08_html/Readme.md b/inst/examples-shiny/08_html/Readme.md similarity index 100% rename from inst/shiny/08_html/Readme.md rename to inst/examples-shiny/08_html/Readme.md diff --git a/inst/shiny/08_html/app.R b/inst/examples-shiny/08_html/app.R similarity index 100% rename from inst/shiny/08_html/app.R rename to inst/examples-shiny/08_html/app.R diff --git a/inst/shiny/08_html/www/index.html b/inst/examples-shiny/08_html/www/index.html similarity index 100% rename from inst/shiny/08_html/www/index.html rename to inst/examples-shiny/08_html/www/index.html diff --git a/inst/shiny/09_upload/DESCRIPTION b/inst/examples-shiny/09_upload/DESCRIPTION similarity index 100% rename from inst/shiny/09_upload/DESCRIPTION rename to inst/examples-shiny/09_upload/DESCRIPTION diff --git a/inst/shiny/09_upload/Readme.md b/inst/examples-shiny/09_upload/Readme.md similarity index 100% rename from inst/shiny/09_upload/Readme.md rename to inst/examples-shiny/09_upload/Readme.md diff --git a/inst/shiny/09_upload/app.R b/inst/examples-shiny/09_upload/app.R similarity index 100% rename from inst/shiny/09_upload/app.R rename to inst/examples-shiny/09_upload/app.R diff --git a/inst/shiny/10_download/DESCRIPTION b/inst/examples-shiny/10_download/DESCRIPTION similarity index 100% rename from inst/shiny/10_download/DESCRIPTION rename to inst/examples-shiny/10_download/DESCRIPTION diff --git a/inst/shiny/10_download/Readme.md b/inst/examples-shiny/10_download/Readme.md similarity index 100% rename from inst/shiny/10_download/Readme.md rename to inst/examples-shiny/10_download/Readme.md diff --git a/inst/shiny/10_download/app.R b/inst/examples-shiny/10_download/app.R similarity index 100% rename from inst/shiny/10_download/app.R rename to inst/examples-shiny/10_download/app.R diff --git a/inst/shiny/11_timer/DESCRIPTION b/inst/examples-shiny/11_timer/DESCRIPTION similarity index 100% rename from inst/shiny/11_timer/DESCRIPTION rename to inst/examples-shiny/11_timer/DESCRIPTION diff --git a/inst/shiny/11_timer/Readme.md b/inst/examples-shiny/11_timer/Readme.md similarity index 100% rename from inst/shiny/11_timer/Readme.md rename to inst/examples-shiny/11_timer/Readme.md diff --git a/inst/shiny/11_timer/app.R b/inst/examples-shiny/11_timer/app.R similarity index 100% rename from inst/shiny/11_timer/app.R rename to inst/examples-shiny/11_timer/app.R