Seeding intermediate material

Makefile

@@ -10,31 +10,31 @@
 # as needed.
 #-----------------------------------------------------------
 
-# Directories.
+# Auxiliary directories.
 OUT = _site
 TMP = tmp
 LINK_OUT = /tmp/bc-links
 
+# Source directories (add more here as lessons materialize).
+NOVICE_DIR = bash git python sql
+INTERMEDIATE_DIR = bash hash make
+
 # Source and destination Markdown/HTML pages.
 MARKDOWN_SRC = \
 	LICENSE.md \
 	NEW_MATERIAL.md \
 	bib.md \
 	gloss.md \
 	rules.md \
-	$(wildcard bash/novice/*.md) \
-	$(wildcard git/novice/*.md) \
-	$(wildcard python/novice/*.md) \
-	$(wildcard sql/novice/*.md)
+	$(wildcard $(patsubst %,%/novice/*.md,$(NOVICE_DIR))) \
+	$(wildcard $(patsubst %,%/intermediate/*.md,$(INTERMEDIATE_DIR)))
 MARKDOWN_DST = \
 	$(patsubst %.md,$(OUT)/%.html,$(MARKDOWN_SRC))
 
 # Source, cached, and destination Notebook files/HTML pages.
 NOTEBOOK_SRC = \
-	$(wildcard bash/novice/*.ipynb) \
-	$(wildcard git/novice/*.ipynb) \
-	$(wildcard python/novice/*.ipynb) \
-	$(wildcard sql/novice/*.ipynb)
+	$(wildcard $(patsubst %,%/novice/*.ipynb,$(NOVICE_DIR))) \
+	$(wildcard $(patsubst %,%/intermediate/*.ipynb,$(INTERMEDIATE_DIR)))
 NOTEBOOK_TMP = \
 	$(patsubst %.ipynb,$(TMP)/%.html,$(NOTEBOOK_SRC))
 NOTEBOOK_DST = \
@@ -66,10 +66,14 @@ $(NOTEBOOK_DST) : $(OUT)
 $(OUT)/%.html : $(TMP)/%.html
 	cp $< $@
 
-# Build HTML versions of Markdown source files using Jekyll.  This always
-# erases and re-creates the output directory.
+# Build HTML versions of Markdown source files using Jekyll.  This
+# always erases and re-creates the output directory, and replaces the
+# template file for bootcamp websites with the NEW_MATERIAL.html index
+# to the lessons.
 $(OUT) : $(MARKDOWN_SRC)
 	jekyll -t build -d $(OUT)
+	mv $(OUT)/NEW_MATERIAL.html $(OUT)/index.html
+	rm -rf $$(find _site -name '*_files' -type d -print)
 
 # Build HTML versions of IPython Notebooks.  This is slow, so we cache
 # the results in a temporary directory.
@@ -99,7 +103,7 @@ links :
 
 ## clean    : clean up
 clean :
-	rm -rf $(OUT) $(TMP) $$(find . -name '*~' -print) $$(find . -name '*.pyc' -print)
+	rm -rf $(OUT) $(TMP) $$(find . -name '*~' -print) $$(find . -name '*.pyc' -print) $$(find . -name '*_files' -type d -print)
 
 ## show     : show variables
 show :

NEW_MATERIAL.md

@@ -12,7 +12,7 @@ title: New Material
   <tr>
     <th>The Unix Shell</th>
     <td><a href="./bash/novice/index.html">X</a></td>
-    <td>-</td>
+    <td><a href="./bash/intermediate/index.html">X</a></td>
   </tr>
   <tr>
     <th>Version Control with Git</th>
@@ -24,6 +24,16 @@ title: New Material
     <td><a href="./python/novice/index.html">X</a></td>
     <td>-</td>
   </tr>
+  <tr>
+    <th>Sets and Dictionaries</th>
+    <td>-</td>
+    <td><a href="./hash/intermediate/index.html">X</a></td>
+  </tr>
+  <tr>
+    <th>Automating Tasks with Make</th>
+    <td>-</td>
+    <td><a href="./make/intermediate/index.html">X</a></td>
+  </tr>
   <tr>
     <th>Programming with R</th>
     <td>-</td>

bash/intermediate/01-perm.md

@@ -0,0 +1,23 @@
+---
+layout: lesson
+root: ../..
+title: Permissions
+level: intermediate
+---
+<div class="objectives" markdown="1">
+## Objectives
+*   FIXME
+</div>
+
+## Lesson
+
+<div class="keypoints" markdown="1">
+## Key Points
+*   FIXME
+</div>
+
+<div class="challenges" markdown="1">
+## Challenges
+
+1.  FIXME
+</div>