Skip to content

Commit

Permalink
Changed check for phantomjs via Yihui's suggestion at wch/webshot#25 …
Browse files Browse the repository at this point in the history
  • Loading branch information
ismayc committed Jul 31, 2016
1 parent b03efb4 commit 5bf3360
Show file tree
Hide file tree
Showing 28 changed files with 22 additions and 18 deletions.
2 changes: 1 addition & 1 deletion 01-prereqs.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if (length(new.pkgs)) {
install.packages(new.pkgs, repos = "http://cran.rstudio.com")
}
# Check that phantomjs is installed
if(webshot:::find_phantom() == "")
if(is.null(webshot:::find_phantom()))
webshot::install_phantomjs()
```

Expand Down
3 changes: 2 additions & 1 deletion 90-appendix1.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

- What is R? What is RStudio?
- Screenshots of RStudio frames?
- Installing R and RStudio directions with screenshots
- Give an introduction into using R
- Mean, median, standard deviation, five-number summary
- Mean, median, standard deviation, five-number summary, distribution
- Some content to cover:
+ data structures (vectors, lists, data frames, matrices)
+ indexing/subsetting
Expand Down
3 changes: 2 additions & 1 deletion _book/appendix1.html
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,9 @@ <h1><span class="header-section-number">7</span> Appendix A: R and RStudio Basic
<ul>
<li>What is R? What is RStudio?</li>
<li>Screenshots of RStudio frames?</li>
<li>Installing R and RStudio directions with screenshots</li>
<li>Give an introduction into using R</li>
<li>Mean, median, standard deviation, five-number summary</li>
<li>Mean, median, standard deviation, five-number summary, distribution</li>
<li>Some content to cover:
<ul>
<li>data structures (vectors, lists, data frames, matrices)</li>
Expand Down
Empty file removed _book/index.html
Empty file.
Binary file modified _book/ismay_kim.epub
Binary file not shown.
Binary file modified _book/ismay_kim.pdf
Binary file not shown.
12 changes: 7 additions & 5 deletions _book/ismay_kim.tex
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ \chapter{Prerequisites}\label{prereqs}
\KeywordTok{install.packages}\NormalTok{(new.pkgs, }\DataTypeTok{repos =} \StringTok{"http://cran.rstudio.com"}\NormalTok{)}
\NormalTok{\}}
\CommentTok{# Check that phantomjs is installed}
\NormalTok{if(webshot:::}\KeywordTok{find_phantom}\NormalTok{() ==}\StringTok{ ""}\NormalTok{)}
\NormalTok{if(}\KeywordTok{is.null}\NormalTok{(webshot:::}\KeywordTok{find_phantom}\NormalTok{()))}
\NormalTok{webshot::}\KeywordTok{install_phantomjs}\NormalTok{()}
\end{Highlighting}
\end{Shaded}
Expand All @@ -240,7 +240,7 @@ \section{Colophon}\label{colophon}
## ui X11
## language (EN)
## collate en_US.UTF-8
## tz America/Detroit
## tz America/Chicago
## date 2016-07-31
\end{verbatim}

Expand Down Expand Up @@ -1017,7 +1017,7 @@ \section{What's to come?}\label{whats-to-come}
\textbf{Last updated:}

\begin{verbatim}
## [1] "Sunday, July 31, 2016 01:00:40 EDT"
## [1] "Sunday, July 31, 2016 16:12:58 CDT"
\end{verbatim}

\chapter{Visualizing Data}\label{viz}
Expand Down Expand Up @@ -2202,7 +2202,7 @@ \section{What's to come?}\label{whats-to-come-1}
\textbf{Last updated:}
\begin{verbatim}
## [1] "Sunday, July 31, 2016 01:01:28 EDT"
## [1] "Sunday, July 31, 2016 16:13:41 CDT"
\end{verbatim}
\chapter{Manipulating Data}\label{manip}
Expand Down Expand Up @@ -2259,10 +2259,12 @@ \chapter{Appendix A: R and RStudio Basics}\label{appendix1}
What is R? What is RStudio?
\item
Screenshots of RStudio frames?
\item
Installing R and RStudio directions with screenshots
\item
Give an introduction into using R
\item
Mean, median, standard deviation, five-number summary
Mean, median, standard deviation, five-number summary, distribution
\item
Some content to cover:
Expand Down
Binary file not shown.
Binary file modified _book/ismay_kim_files/figure-html/jitteralpha-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed _book/ismay_kim_files/figure-html/no-alpha-1.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified _book/ismay_kim_files/figure-html/unnamed-chunk-31-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file removed _book/placeholder-1.html
Empty file.
4 changes: 2 additions & 2 deletions _book/prereqs.html
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ <h1><span class="header-section-number">1</span> Prerequisites</h1>
<span class="kw">install.packages</span>(new.pkgs, <span class="dt">repos =</span> <span class="st">&quot;http://cran.rstudio.com&quot;</span>)
}
<span class="co"># Check that phantomjs is installed</span>
if(webshot:::<span class="kw">find_phantom</span>() ==<span class="st"> &quot;&quot;</span>)
if(<span class="kw">is.null</span>(webshot:::<span class="kw">find_phantom</span>()))
webshot::<span class="kw">install_phantomjs</span>()</code></pre></div>
<!--
The `printr` package is useful for outputting help files directly into our book and also looking at R output in a clean way. We, thus, need to load the packages via the `library` function:
Expand All @@ -221,7 +221,7 @@ <h2><span class="header-section-number">1.1</span> Colophon</h2>
## ui X11
## language (EN)
## collate en_US.UTF-8
## tz America/Detroit
## tz America/Chicago
## date 2016-07-31</code></pre>
<pre><code>## Packages ---------------------------------------------------------------</code></pre>
<pre><code>## package * version date source
Expand Down
8 changes: 4 additions & 4 deletions _book/search_index.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _book/tidy.html
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ <h2><span class="header-section-number">3.4</span> Normal forms of data</h2>
<h2><span class="header-section-number">3.5</span> What’s to come?</h2>
<p>In Chapter <a href="viz.html#viz">4</a>, we will further explore the distribution of a variable in a related dataset to <code>flights</code>: the <code>temp</code> variable in the <code>weather</code> dataset. We’ll be interested in understanding how this variable varies in relation to the values of other variables in the dataset. We will see that visualization is often a powerful tool in helping us see what is going on in a dataset. It will be a useful way to expand on the <code>str</code> function we have seen here for tidy data.</p>
<p><strong>Last updated:</strong></p>
<pre><code>## [1] &quot;Sunday, July 31, 2016 01:00:02 EDT&quot;</code></pre>
<pre><code>## [1] &quot;Sunday, July 31, 2016 16:12:20 CDT&quot;</code></pre>

</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions _book/viz.html

Large diffs are not rendered by default.

0 comments on commit 5bf3360

Please sign in to comment.