Merge pull request #145 from innovationOUtside/wip

Vagrantfile update and a couple of typos
innovationOUtside · Feb 1, 2021 · 8cde2ec · 8cde2ec
2 parents fb1327a + 3ddf767
commit 8cde2ec
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 121 deletions.
diff --git a/.VM/monolithic_build.sh b/.VM/monolithic_build.sh
@@ -132,4 +132,16 @@ apt-get autoremove -y
 apt-get clean -y
 apt-get autoclean -y
 rm -rf /var/lib/apt/lists/*
-echo "...tidy up done"
+echo "...tidy up done"
+
+# Content stash
+echo "Stash content.."
+mkdir -p /opt/contentStash
+#Bake test notebooks into the VM
+cp -r content/ /opt/contentStash
+cp -r $BUILDDIR/backgrounds /opt/contentStash/nb_backgrounds
+# Hack
+mkdir -p /nb_backgrounds
+chown oustudent /nb_backgrounds
+chmod u+rw /nb_backgrounds
+echo "...content stashed."
diff --git a/...Getting started with robot and Python programming/02.1 Robot programming constructs.ipynb b/...Getting started with robot and Python programming/02.1 Robot programming constructs.ipynb
@@ -578,7 +578,7 @@
     "activity": true
    },
    "source": [
-    "### 1.3.4 Activity — Predicitng a robot's behaviour from it's program\n",
+    "### 1.3.4 Activity — Predicting a robot's behaviour from its program\n",
     "\n",
     "Suppose that a simulated robot starts pointing towards the top of the screen. If you download and run the program in the code cell below, will the robot turn towards the right or left while executing the sequence of commands shown?\n",
     "\n",

diff --git a/content/07. Neural networks/07.1 Introducing neural networks.ipynb b/content/07. Neural networks/07.1 Introducing neural networks.ipynb
@@ -144,7 +144,7 @@
     ]
    },
    "source": [
-    "*Large social networking services such as Facebook train classifiers on uploaded images and tags to identify people in uploaded photographs. Whenever you tag people in a photograph uploaded to such services, you are helping train the classifiers operated by those compaies.*"
+    "*Large social networking services such as Facebook train classifiers on uploaded images and tags to identify people in uploaded photographs. Whenever you tag people in a photograph uploaded to such services, you are helping train the classifiers operated by those companies.*"
    ]
   },
   {

diff --git a/content/99. Technical Appendices/Untitled.md b/content/99. Technical Appendices/Untitled.md
diff --git a/content/99. Technical Appendices/example_mnist_4.png b/content/99. Technical Appendices/example_mnist_4.png
diff --git a/production/Vagrantfile b/production/Vagrantfile
diff --git a/production/Vagrantfile.build b/production/Vagrantfile.build
@@ -1,8 +1,8 @@
 #Vagrantfile for building machine from build scripts
 
 #Set the environment variable from the command line used to call vagrant for:
-# - password for authenticated notebook services (default is: tm129)
-#export VM_NB_TMP_PASS="tm129"
+# - password for authenticated notebook services (default is: letmein)
+#export VM_NB_TMP_PASS="letmein"
 
 
 # Change the path in the SHARED_FOLDER_PATH setting below (default: "."):
@@ -65,4 +65,4 @@ Vagrant.configure("2") do |config|
 	SH
 
 
-end
+end
diff --git a/production/Vagrantfile.student b/production/Vagrantfile.student
@@ -88,16 +88,19 @@ Vagrant.configure("2") do |config|
 
   config.vm.provision :shell, :inline => <<-SH
 
-    #if [ ! -f /vagrant/.firstrun_nbcopy.done ]; then
+    if [ ! -f /vagrant/.firstrun_nbcopy.done ]; then
         # Trust notebooks in immediate child directories of notebook directory
         #files=(`find /opt/notebooks/* -maxdepth 2 -name "*.ipynb"`)
         #if [ ${#files[@]} -gt 0 ]; then
         #    jupyter trust /opt/notebooks/*.ipynb;
         #    jupyter trust /opt/notebooks/*/*.ipynb;
         #fi
         #cp -r /opt/notebooks/. /vagrant/notebooks
-        #touch /vagrant/.firstrun_nbcopy.done
-    #fi
+        cp -ra /opt/contentStash/. /vagrant/notebooks
+        chown -R oustudent /vagrant/notebooks/
+        jupyter trust /vagrant/notebooks/*/*/*.ipynb
+        touch /vagrant/.firstrun_nbcopy.done
+    fi
    SH
 
 end