From 628dfd1ebdc291ddcdd72ece14754ab9b189c662 Mon Sep 17 00:00:00 2001 From: Sarah Stevens Date: Wed, 5 Feb 2025 14:07:35 -0600 Subject: [PATCH 1/5] Moving onedrive solution inline --- episodes/02-filedir.md | 29 +++++++++++++++++++++++++++++ instructors/instructor-notes.md | 17 ----------------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/episodes/02-filedir.md b/episodes/02-filedir.md index a96c8d667..4a0e205ed 100644 --- a/episodes/02-filedir.md +++ b/episodes/02-filedir.md @@ -405,6 +405,35 @@ Note that if a directory named `Desktop` does not exist in your current working this command will return an error. Typically, a `Desktop` directory exists in your home directory, which we assume is the current working directory of your bash shell. +:::::::::::::: callout + +### OneDrive Variations + +If a Windows machine is backed up with OneDrive, your Desktop may + be rendered from a folder within OneDrive, which will not match the contents of `~/Desktop`. + The OneDrive desktop should be accessible using one of the following commands + (if the name of the enterprise/org isn't clear, look through the output of `ls` to find + the right folder): + + ```bash + $ cd "~/OneDrive - Name Of Enterprise/Desktop" + $ cd "C:/Users/Username/OneDrive - Name Of Enterprise/Desktop" + ``` + +Note: The quotation marks are needed since the Unix shell interprets spaces to be meaningful separators between files/commands/options. + +::: instructor + + One way to spot if the computer is using this kind of configuration is to look at files, + folders or links on the desktop. Usually the icon contains a shortcut/arrow symbol if it + is a link, or just the plain icon if the file is just saved in the `Desktop` folder. + Files synced with OneDrive contain an additional symbol indicating the sync status + (typically blue arrows for 'sync pending' or a green tick for 'synced'). + +:::::::::::::: + +:::::::::::::::::::::: + Your output should be a list of all the files and sub-directories in your Desktop directory, including the `shell-lesson-data` directory you downloaded at the [setup for this lesson](../learners/setup.md). (On most systems, the diff --git a/instructors/instructor-notes.md b/instructors/instructor-notes.md index 57d878780..49e6ff786 100644 --- a/instructors/instructor-notes.md +++ b/instructors/instructor-notes.md @@ -221,23 +221,6 @@ as long as learners using Windows do not run into roadblocks such as: so that they can find it easily and watch it evolve. -- If a Windows machine is backed up with enterprise OneDrive, their GUI desktop may - be rendered from a folder within OneDrive, which will not match the contents of `~/Desktop`. - The OneDrive desktop should be accessible using one of the following commands - (if the name of the enterprise isn't clear, look through the output of `ls` to find - the right folder): - - ```bash - $ cd "~/OneDrive - Name Of Enterprise/Desktop" - $ cd "C:/Users/Username/OneDrive - Name Of Enterprise/Desktop" - ``` - - One way to spot if the computer is using this kind of configuration is to look at files, - folders or links on the desktop. Usually the icon contains a shortcut/arrow symbol if it - is a link, or just the plain icon if the file is just saved in the `Desktop` folder. - Files synced with OneDrive contain an additional symbol indicating the sync status - (typically blue arrows for 'sync pending' or a green tick for 'synced'). - - Stay within POSIX-compliant commands, as all the teaching materials do. Your particular shell may have extensions beyond POSIX that are not available on other machines, especially the default macOS bash and Windows bash emulators. From 9dfb9e48db8b12d4e83673e655c1dcc7a1c16d1c Mon Sep 17 00:00:00 2001 From: Sarah Stevens Date: Wed, 5 Feb 2025 14:15:34 -0600 Subject: [PATCH 2/5] adding context so the instructor note will stand alone better --- episodes/02-filedir.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/episodes/02-filedir.md b/episodes/02-filedir.md index 4a0e205ed..58086c41a 100644 --- a/episodes/02-filedir.md +++ b/episodes/02-filedir.md @@ -424,7 +424,7 @@ Note: The quotation marks are needed since the Unix shell interprets spaces to b ::: instructor - One way to spot if the computer is using this kind of configuration is to look at files, + One way to spot if the computer is using this kind of configuration with OneDrive is to look at files, folders or links on the desktop. Usually the icon contains a shortcut/arrow symbol if it is a link, or just the plain icon if the file is just saved in the `Desktop` folder. Files synced with OneDrive contain an additional symbol indicating the sync status From b82f100d6c9a05fe4a33ce70e0328b6d4ff8a8c8 Mon Sep 17 00:00:00 2001 From: Sarah Stevens Date: Thu, 6 Feb 2025 10:40:13 -0600 Subject: [PATCH 3/5] Updating based on feedback from @jas58 --- episodes/02-filedir.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/episodes/02-filedir.md b/episodes/02-filedir.md index 58086c41a..1b05d8782 100644 --- a/episodes/02-filedir.md +++ b/episodes/02-filedir.md @@ -410,7 +410,7 @@ home directory, which we assume is the current working directory of your bash sh ### OneDrive Variations If a Windows machine is backed up with OneDrive, your Desktop may - be rendered from a folder within OneDrive, which will not match the contents of `~/Desktop`. + have been moved within OneDrive and you will get an error when you try `ls -F Desktop`. The OneDrive desktop should be accessible using one of the following commands (if the name of the enterprise/org isn't clear, look through the output of `ls` to find the right folder): @@ -420,7 +420,7 @@ If a Windows machine is backed up with OneDrive, your Desktop may $ cd "C:/Users/Username/OneDrive - Name Of Enterprise/Desktop" ``` -Note: The quotation marks are needed since the Unix shell interprets spaces to be meaningful separators between files/commands/options. +Note: The quotation marks are needed for this folder because the Unix shell interprets spaces to be meaningful separators between files/commands/options but this folder has spaces in the name. ::: instructor From b68a29433d152b7ee72d1f3b1b2d1d5f474708d3 Mon Sep 17 00:00:00 2001 From: Sarah Stevens Date: Thu, 6 Feb 2025 10:43:46 -0600 Subject: [PATCH 4/5] Update based on feedback from @jas58 --- episodes/02-filedir.md | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/episodes/02-filedir.md b/episodes/02-filedir.md index 1b05d8782..e5d13ee1e 100644 --- a/episodes/02-filedir.md +++ b/episodes/02-filedir.md @@ -410,16 +410,23 @@ home directory, which we assume is the current working directory of your bash sh ### OneDrive Variations If a Windows machine is backed up with OneDrive, your Desktop may - have been moved within OneDrive and you will get an error when you try `ls -F Desktop`. - The OneDrive desktop should be accessible using one of the following commands - (if the name of the enterprise/org isn't clear, look through the output of `ls` to find - the right folder): +have been moved within OneDrive and you will get an error when you try `ls -F Desktop`. + +To check if this is true for you, run the command `ls` and look through the output for a folder that has "OneDrive" in the name and note that folder name. It will likely include the name of your organization in it. It may be something like `OneDrive - University of Example`. - ```bash - $ cd "~/OneDrive - Name Of Enterprise/Desktop" - $ cd "C:/Users/Username/OneDrive - Name Of Enterprise/Desktop" - ``` +If you don't see a "OneDrive" folder, you may not be in your home folder or there may be another issue going on. To check you are in your home folder, type `pwd` and it should show something like `C:/Users/Username` or `/c/Users/Username`. +If you do see the "OneDrive" folder, going forward whenever the lesson or instructor uses the `Desktop` folder, you will need to include the OneDrive folder as well. For example if the instructor types... + +``` bash +ls -F Desktop +``` + +You will need to type: + +```bash +ls -F "OneDrive - Name Of Enterprise/Desktop" +``` Note: The quotation marks are needed for this folder because the Unix shell interprets spaces to be meaningful separators between files/commands/options but this folder has spaces in the name. ::: instructor From ee7ba72b32fd6324ba7bd4b3b9aef3f3c7c560b1 Mon Sep 17 00:00:00 2001 From: Sarah Stevens Date: Mon, 10 Feb 2025 09:25:46 -0600 Subject: [PATCH 5/5] fixing university example --- episodes/02-filedir.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/episodes/02-filedir.md b/episodes/02-filedir.md index e5d13ee1e..1ab6eb2d7 100644 --- a/episodes/02-filedir.md +++ b/episodes/02-filedir.md @@ -425,7 +425,7 @@ ls -F Desktop You will need to type: ```bash -ls -F "OneDrive - Name Of Enterprise/Desktop" +ls -F "OneDrive - University of Example/Desktop" ``` Note: The quotation marks are needed for this folder because the Unix shell interprets spaces to be meaningful separators between files/commands/options but this folder has spaces in the name.