From e976b55a5c2a83f4f2ab1221ea228c9b8737db4f Mon Sep 17 00:00:00 2001 From: Simeon Wong Date: Thu, 14 Nov 2024 20:32:09 -0500 Subject: [PATCH 1/7] delete ip logs... WARNING UNTESTED! --- 02_activities/assignments/assignment.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index d81e9a77b..001291867 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -33,6 +33,7 @@ unzip rawdata.zip # 6. Repeat the above step for user logs and event logs # 7. For user privacy, remove all files containing IP addresses (files with "ipaddr" in the filename) from ./data/raw and ./data/processed/user_logs +rf -rf ./data # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed From ea20676d33161a6f4d0fcd3c4f7aa5360f0f4309 Mon Sep 17 00:00:00 2001 From: Simeon Wong Date: Thu, 14 Nov 2024 20:55:44 -0500 Subject: [PATCH 2/7] initialize README file with company name --- 02_activities/assignments/assignment.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 001291867..f2bfd22bd 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -11,6 +11,7 @@ set -x mkdir analysis output touch README.md +echo "# Project Name: DSI Consulting Inc." > README.md touch analysis/main.py # download client data From 85472182be5f0f200bce81a0503e55775146b99a Mon Sep 17 00:00:00 2001 From: sarahcreighton Date: Thu, 6 Nov 2025 19:47:18 -0500 Subject: [PATCH 3/7] completed Q1 --- 02_activities/assignments/assignment.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 4b2baa7ae..35e60927f 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -28,6 +28,7 @@ unzip -q rawdata.zip # Complete assignment here # 1. Create a directory named data +mkdir data/ # 2. Move the ./rawdata directory to ./data/raw From 19b8bc36c535b47c2cadbc82a3b4a0b1612a5842 Mon Sep 17 00:00:00 2001 From: sarahcreighton Date: Thu, 6 Nov 2025 21:12:56 -0500 Subject: [PATCH 4/7] Completed Q2-4 --- 02_activities/assignments/assignment.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 35e60927f..03c53c6d8 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -31,10 +31,14 @@ unzip -q rawdata.zip mkdir data/ # 2. Move the ./rawdata directory to ./data/raw +mv ./rawdata ./data/raw/ # 3. List the contents of the ./data/raw directory +ls ./data/raw/ # 4. In ./data/processed, create the following directories: server_logs, user_logs, and event_logs +mkdir ./data/processed/ # create parent dir +mkdir ./data/processed/server_logs ./data/processed/user_logs ./data/processed/event_logs # 5. Copy all server log files (files with "server" in the name AND a .log extension) from ./data/raw to ./data/processed/server_logs From 970e5f3fd30b1276571fd6512e695591c8f962c9 Mon Sep 17 00:00:00 2001 From: sarahcreighton Date: Thu, 6 Nov 2025 21:46:31 -0500 Subject: [PATCH 5/7] Completed Q5-8 --- 02_activities/assignments/assignment.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 03c53c6d8..ec641ed54 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -41,13 +41,17 @@ mkdir ./data/processed/ # create parent dir mkdir ./data/processed/server_logs ./data/processed/user_logs ./data/processed/event_logs # 5. Copy all server log files (files with "server" in the name AND a .log extension) from ./data/raw to ./data/processed/server_logs +cp ./data/raw/server*.log ./data/processed/server_logs/ # 6. Repeat the above step for user logs and event logs +cp ./data/raw/user*.log ./data/processed/user_logs/ +cp ./data/raw/event*.log ./data/processed/event_logs/ # 7. For user privacy, remove all files containing IP addresses (files with "ipaddr" in the filename) from ./data/raw and ./data/processed/user_logs +rm ./data/raw/*ipaddr* ./data/processed/user_logs/user*ipaddr* # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed - +ls ./data/processed/* > ./data/inventory.txt ########################################### From 8d71f492f4f251f9d034718b5efe27d35e991134 Mon Sep 17 00:00:00 2001 From: sarahcreighton Date: Fri, 7 Nov 2025 13:07:57 -0500 Subject: [PATCH 6/7] Corrected Q7. Updated pattern matching to remove files in data/processed/user_logs/ that contain ipaddr anywhere in the filename --- 02_activities/assignments/assignment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 8f9f81c73..21eab047a 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -49,7 +49,7 @@ cp ./data/raw/user*.log ./data/processed/user_logs/ cp ./data/raw/event*.log ./data/processed/event_logs/ # 7. For user privacy, remove all files containing IP addresses (files with "ipaddr" in the filename) from ./data/raw and ./data/processed/user_logs -rm ./data/raw/*ipaddr* ./data/processed/user_logs/user*ipaddr* +rm ./data/raw/*ipaddr* ./data/processed/user_logs/*ipaddr* # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed ls ./data/processed/* > ./data/inventory.txt From 9f8828365134f78abe3811fdd4e7956397d0e002 Mon Sep 17 00:00:00 2001 From: sarahcreighton Date: Sat, 8 Nov 2025 09:54:50 -0500 Subject: [PATCH 7/7] Added comments, improved Q4 with mkdir -p, commented out unneeded code --- 02_activities/assignments/assignment.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 21eab047a..fa2a103f3 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -9,15 +9,15 @@ set -x # project name and a brief description of the project. # Then it unzips the raw data provided by the client. -if [ -d newproject ]; then +if [ -d newproject ]; then # if dir exists echo "Recreating the newproject directory" - rm -rf newproject + rm -rf newproject # force recursive delete fi -mkdir newproject +mkdir newproject # reset project dir cd newproject mkdir analysis output -touch README.md +#touch README.md # commented out; std out has same effect echo "# Project Name: DSI Consulting Inc." > README.md touch analysis/main.py @@ -38,8 +38,7 @@ mv ./rawdata ./data/raw/ ls ./data/raw/ # 4. In ./data/processed, create the following directories: server_logs, user_logs, and event_logs -mkdir ./data/processed/ # create parent dir -mkdir ./data/processed/server_logs ./data/processed/user_logs ./data/processed/event_logs +mkdir -p ./data/processed/server_logs ./data/processed/user_logs ./data/processed/event_logs # 5. Copy all server log files (files with "server" in the name AND a .log extension) from ./data/raw to ./data/processed/server_logs cp ./data/raw/server*.log ./data/processed/server_logs/