Fix licence (forget Non-Commercial)

Author: jeroenjanssens

.gitignore

@@ -7,10 +7,7 @@ docs/*.md
 _book_output
 
 node_modules/
-www/public/
-www/resources/
-www/static/1e/
-www/static/2e/
+www/_site
 
 *.rds
 /book/2e/*.md

LICENSE

@@ -1,10 +1,7 @@
 Data Science at the Command Line (c) by Jeroen Janssens
 
 Data Science at the Command Line is licensed under a
-Creative Commons Attribution-NoDerivatives 4.0 International License.
-
-
-Attribution-NoDerivatives 4.0 International
+Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
 
 =======================================================================
 
@@ -58,21 +55,20 @@ exhaustive, and do not form part of our licenses.
      for the public:
     wiki.creativecommons.org/Considerations_for_licensees
 
-
 =======================================================================
 
-Creative Commons Attribution-NoDerivatives 4.0 International Public
-License
+Creative Commons Attribution-NonCommercial-NoDerivatives 4.0
+International Public License
 
 By exercising the Licensed Rights (defined below), You accept and agree
 to be bound by the terms and conditions of this Creative Commons
-Attribution-NoDerivatives 4.0 International Public License ("Public
-License"). To the extent this Public License may be interpreted as a
-contract, You are granted the Licensed Rights in consideration of Your
-acceptance of these terms and conditions, and the Licensor grants You
-such rights in consideration of benefits the Licensor receives from
-making the Licensed Material available under these terms and
-conditions.
+Attribution-NonCommercial-NoDerivatives 4.0 International Public
+License ("Public License"). To the extent this Public License may be
+interpreted as a contract, You are granted the Licensed Rights in
+consideration of Your acceptance of these terms and conditions, and the
+Licensor grants You such rights in consideration of benefits the
+Licensor receives from making the Licensed Material available under
+these terms and conditions.
 
 
 Section 1 -- Definitions.
@@ -117,21 +113,29 @@ Section 1 -- Definitions.
   g. Licensor means the individual(s) or entity(ies) granting rights
      under this Public License.
 
-  h. Share means to provide material to the public by any means or
+  h. NonCommercial means not primarily intended for or directed towards
+     commercial advantage or monetary compensation. For purposes of
+     this Public License, the exchange of the Licensed Material for
+     other material subject to Copyright and Similar Rights by digital
+     file-sharing or similar means is NonCommercial provided there is
+     no payment of monetary compensation in connection with the
+     exchange.
+
+  i. Share means to provide material to the public by any means or
      process that requires permission under the Licensed Rights, such
      as reproduction, public display, public performance, distribution,
      dissemination, communication, or importation, and to make material
      available to the public including in ways that members of the
      public may access the material from a place and at a time
      individually chosen by them.
 
-  i. Sui Generis Database Rights means rights other than copyright
+  j. Sui Generis Database Rights means rights other than copyright
      resulting from Directive 96/9/EC of the European Parliament and of
      the Council of 11 March 1996 on the legal protection of databases,
      as amended and/or succeeded, as well as other essentially
      equivalent rights anywhere in the world.
 
-  j. You means the individual or entity exercising the Licensed Rights
+  k. You means the individual or entity exercising the Licensed Rights
      under this Public License. Your has a corresponding meaning.
 
 
@@ -145,9 +149,10 @@ Section 2 -- Scope.
           exercise the Licensed Rights in the Licensed Material to:
 
             a. reproduce and Share the Licensed Material, in whole or
-               in part; and
+               in part, for NonCommercial purposes only; and
 
-            b. produce and reproduce, but not Share, Adapted Material.
+            b. produce and reproduce, but not Share, Adapted Material
+               for NonCommercial purposes only.
 
        2. Exceptions and Limitations. For the avoidance of doubt, where
           Exceptions and Limitations apply to Your use, this Public
@@ -209,7 +214,9 @@ Section 2 -- Scope.
           Rights, whether directly or through a collecting society
           under any voluntary or waivable statutory or compulsory
           licensing scheme. In all other cases the Licensor expressly
-          reserves any right to collect such royalties.
+          reserves any right to collect such royalties, including when
+          the Licensed Material is used other than for NonCommercial
+          purposes.
 
 
 Section 3 -- License Conditions.
@@ -269,12 +276,14 @@ apply to Your use of the Licensed Material:
 
   a. for the avoidance of doubt, Section 2(a)(1) grants You the right
      to extract, reuse, reproduce, and Share all or a substantial
-     portion of the contents of the database, provided You do not Share
-     Adapted Material;
+     portion of the contents of the database for NonCommercial purposes
+     only and provided You do not Share Adapted Material;
+
   b. if You include all or a substantial portion of the database
      contents in a database in which You have Sui Generis Database
      Rights, then the database in which You have Sui Generis Database
      Rights (but not its individual contents) is Adapted Material; and
+
   c. You must comply with the conditions in Section 3(a) if You Share
      all or a substantial portion of the contents of the database.
 
@@ -394,4 +403,3 @@ the avoidance of doubt, this paragraph does not form part of the
 public licenses.
 
 Creative Commons may be contacted at creativecommons.org.
-

Makefile

@@ -8,22 +8,18 @@ SHELL = /usr/bin/env bash -o pipefail
 clean:
 	rm -f book/2e/book.md
 
-live:
-	cd www && hugo server --disableFastRender
-
 2e: book/2e/*.Rmd
-	cd book/2e && rm -f book.md && Rscript --vanilla -e 'bookdown::render_book("index.Rmd", encoding = "UTF-8", clean = FALSE)'
-
-hugo:
-	(cd www && hugo) && \
-	(cd book/2e/data && zip data */*) && \
-	mv book/2e/data/data.zip www/static/2e/
+	cd book/2e &&\
+	rm -f book.md &&\
+	Rscript --vanilla -e 'bookdown::render_book("index.Rmd", encoding = "UTF-8", clean = FALSE)'
 
-publish-draft: hugo
-	netlify deploy --dir www/public
-
-publish-production: hugo
-	netlify deploy --prod --dir www/public
+copy-2e:
+	cd book/2e/output &&\
+	rm -f *.md &&\
+	cp -vr * ../../../www/src/2e/ &&\
+    cd ../data &&\
+    zip data */* &&\
+    mv -v data.zip ../../../www/src/2e/
 
 book/2e/%.utf8.md: book/2e/%.Rmd
 	cd book/2e && Rscript --vanilla -e 'bookdown::render_book("$*.Rmd", encoding = "UTF-8", preview = TRUE, clean = FALSE, new_session = TRUE)'
@@ -60,3 +56,15 @@ lab:
 
 appendix:
 	cd book/2e/bin && ./appendix.py > ../tools.Rmd
+
+build-www:
+	cd www && npm run build
+
+live:
+	cd www && npm run start
+
+publish-draft: build-www
+	netlify deploy --dir www/_site
+
+publish-production: build-www
+	netlify deploy --prod --dir www/_site

README.md

@@ -1,10 +1,10 @@
 # Data Science at the Command Line
 
-[![License: CC BY-ND 4.0](https://img.shields.io/badge/License-CC%20BY--ND%204.0-lightgrey.svg)](https://creativecommons.org/licenses/by-nd/4.0/)
+[![License: CC BY-NC-ND 4.0](https://img.shields.io/badge/license-CC%20BY--NC--ND%204.0-orange.svg?style=flat-square)](https://creativecommons.org/licenses/by-nc-nd/4.0/)
 
 <a href="https://datascienceatthecommandline.com/">
 <img src="https://datascienceatthecommandline.com/2e/images/cover-readme.png" width="224px" /></a>
 
-This repository contains the full text, data, and scripts used in the second edition of the book *Data Science at the Command Line* by Jeroen Janssens. The book is licensed under the Creative Commons Attribution-NoDerivatives 4.0 International License.
+This repository contains the full text, data, and scripts used in the second edition of the book *Data Science at the Command Line* by Jeroen Janssens. The book is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
 
 You can read the book for free at https://datascienceatthecommandline.com.

book/2e/_bookdown.yml

@@ -1,6 +1,6 @@
 book_filename: "book"
 repo: https://github.com/jeroenjanssens/data-science-at-the-command-line
-output_dir: "../../www/static/2e"
+output_dir: "output"
 link-citations: true
 language:
   ui: