From e976b55a5c2a83f4f2ab1221ea228c9b8737db4f Mon Sep 17 00:00:00 2001 From: Simeon Wong Date: Thu, 14 Nov 2024 20:32:09 -0500 Subject: [PATCH 1/5] 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/5] 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 e25a6651367e389f0a97a04f2c89c4ccdd710710 Mon Sep 17 00:00:00 2001 From: Kerensa Wong Date: Thu, 6 Nov 2025 18:47:04 -0500 Subject: [PATCH 3/5] Please enter the commit message for your changes. Lines starting --- 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 8af8dc092..db7ba57b4 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 8b31ebb6734eb4171bd01b9c259ee9daa01b96bc Mon Sep 17 00:00:00 2001 From: Kerensa Wong Date: Thu, 6 Nov 2025 23:01:18 -0500 Subject: [PATCH 4/5] Amended Assignment for submission --- 02_activities/assignments/assignment.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index db7ba57b4..d430702ea 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -10,8 +10,8 @@ set -x # Then it unzips the raw data provided by the client. if [ -d newproject ]; then - echo "Directory 'newproject' already exists. Please remove it before running this script." - exit 1 + echo "Recreating the newproject directory" + rm -rf newproject fi mkdir newproject cd newproject @@ -29,21 +29,22 @@ unzip -q rawdata.zip # 1. Create a directory named data 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 -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/ # 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 -v data/raw/*ipaddr* +rm -v 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 5594bbf936d294bd6ed1adc101302ab26f658601 Mon Sep 17 00:00:00 2001 From: Kerensa Wong Date: Thu, 6 Nov 2025 23:39:58 -0500 Subject: [PATCH 5/5] Resolve error in Q7 and Q8 --- 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 54fdfeb52..2ca6df7d4 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -42,7 +42,7 @@ cp data/raw/*server*.log data/processed/server_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 -<<<<<<< HEAD +#<<<<<<< HEAD rm -v data/raw/*ipaddr* rm -v data/processed/user_logs/*ipaddr* #=======