Merge branch 'main' of https://github.com/DHRI-Curriculum/webvm

.github/workflows/deploy.yml

@@ -202,7 +202,7 @@ jobs:
 
       # Create a gh-pages artifact in order to deploy to gh-pages.
       - name: Upload GitHub Pages artifact
-        uses: actions/upload-pages-artifact@v1.0.7
+        uses: actions/upload-pages-artifact@v2
         with:
           # Path of the directory containing the static assets for our gh pages deployment.
           path: ${{ env.DEPLOY_DIR }} # optional, default is _site/
@@ -234,4 +234,4 @@ jobs:
       # Deployment to github pages
       - name: Deploy GitHub Pages site
         id: deployment
-        uses: actions/deploy-pages@v2.0.0
+        uses: actions/deploy-pages@v3

command-line-treasure-hunt/house/upstairs/bedroom/bed/KITTY.md

@@ -3,25 +3,11 @@
 You found a KITTY.md in the bed/ directory! How soft and cuddly. Congratulations!
 
 But it looks lonely. Why don't you make it a DOGGIE.md here in bed/?
-	1. Use the ``touch`` command to create a new, empty file.
+	1. Use the ``echo`` command and redirect to create a new file containing the text "There is a dog in the bed cuddling with the cat!"
 		```
-		touch DOGGIE.md
+		echo “There is a dog in the bed cuddling with the cat!“> DOGGIE.md
 		```
+	2. Use the ``ls`` command to check that the file DOGGIE.md exists within the bed library
+ 	3. Use the ``cat`` command to review that the text is in the file. 
 
-	2. Use the VSCode text editor to edit the file.
-		```
-		code DOGGIE.md
-		```
-
-	3. In the DOGGIE.md file, write the following sentence in the first line of the document:
-		"There is a doggie in the bed!"
-
-		Attention: type the sentence above EXACTLY as is, but without the quotes. Don't add anything else to the file.
-
-	4. Save the changes in the file.
-
-	5. Exit VSCode and go back to the terminal.
-
-If ``code DOGGIE.md`` is returning an error message, don't fret. This is just means that the settings that allow you to run VSCode from the terminal are not on. This is actually not too hard to do. Why don't you go to your browser and google "run vscode from terminal mac" and try to find and follow the instructions.
-
-If it doesn't work or you don't want to work on that issue right now, you can just open VSCode normally, find the DOGGIE.md file from it, add the content and save it. Ask help if you are struggling with this.
+  If the text is there, congratulations! You have finished the first task and the cat is not lonely anymore :) 

dockerfiles/debian_mini

@@ -3,7 +3,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get clean && apt-get update && apt-get -y upgrade
 RUN apt-get -y install apt-utils gcc \
 	python3 vim unzip nodejs \
-	fakeroot dbus base whiptail hexedit \
+	fakeroot dbus base whiptail hexedit nano \
 	patch wamerican ucf manpages \
 	file make dialog curl \
 	less cowsay netcat-openbsd

index.html

@@ -163,20 +163,23 @@
 		},
 		getSharedArrayBufferMissingMessage: function ()
 		{
+			const isCustom = window.location.hostname !== "webvm.io";
+			const isSecureContext = window.isSecureContext;
 			const text = [
 				"",
 				"",
 				color + "CheerpX could not start" + normal,
 				"",
-				"CheerpX depends on JavaScript's SharedArrayBuffer, that your browser",
-				"     does not support.",
+				"CheerpX uses SharedArrayBuffer, which is not available right now.",
 				"",
-				"SharedArrayBuffer is currently enabled by default on recent",
-				"     versions of Chrome, Edge, Firefox and Safari.",
-				"",
-				"",
-				"Give it a try from another browser!",
-				]
+				!isSecureContext && "  -  This page is not in a secure context. Serve over HTTPS or WSS.",
+				!isSecureContext && "    " + underline + "https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts" + noral,
+				isCustom && "  -  The document is not cross-origin isolated.",
+				isCustom && "     " + underline + "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer#security_requirements" + normal, 
+				"  - Your browser might not support SharedArrayBuffer.",
+				"    Since 2022, all major browsers support this feature.",
+				"    " + underline + "https://caniuse.com/sharedarraybuffer" + normal,
+			].filter(Boolean);
 
 			return text;
 		},