From e976b55a5c2a83f4f2ab1221ea228c9b8737db4f Mon Sep 17 00:00:00 2001 From: Simeon Wong Date: Thu, 14 Nov 2024 20:32:09 -0500 Subject: [PATCH 1/6] 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/6] 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 f0d1c439d5a5ccdb01676ef0f53553157806dc97 Mon Sep 17 00:00:00 2001 From: iverbova Date: Wed, 9 Apr 2025 20:24:24 -0400 Subject: [PATCH 3/6] Completed first item in assignment --- 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 2fbb9c81d..7c62dec20 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -21,7 +21,7 @@ unzip -q rawdata.zip # Complete assignment here # 1. Create a directory named data - +mkdir data # 2. Move the ./rawdata directory to ./data/raw # 3. List the contents of the ./data/raw directory From fe5fbde57eaa5c78eb12954875733f4906f4d9ae Mon Sep 17 00:00:00 2001 From: iverbova Date: Thu, 10 Apr 2025 21:36:28 -0400 Subject: [PATCH 4/6] Entered changes to assignment script --- 02_activities/assignments/assignment.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 7c62dec20..77c6fce48 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -23,19 +23,22 @@ unzip -q rawdata.zip # 1. Create a directory named data mkdir data # 2. Move the ./rawdata directory to ./data/raw - +mkdir -p 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 ./data/raw/*ipaddr* +rm ./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 -R ./data/processed > ./data/inventory.txt ########################################### From 3d970422a40191c489ff67008aa394c30bea0943 Mon Sep 17 00:00:00 2001 From: iverbova Date: Thu, 10 Apr 2025 21:43:05 -0400 Subject: [PATCH 5/6] Fix: correctly move rawdata into data/raw --- 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 77c6fce48..4f0ab4594 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -24,7 +24,7 @@ unzip -q rawdata.zip mkdir data # 2. Move the ./rawdata directory to ./data/raw mkdir -p data/raw -mv ./rawdata/* ./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 From 5cf68d108d06181abc2c11bf7e369dbec8dfa2c4 Mon Sep 17 00:00:00 2001 From: iverbova Date: Thu, 10 Apr 2025 21:49:46 -0400 Subject: [PATCH 6/6] Adding further corrections --- 02_activities/assignments/assignment.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 4f0ab4594..3efdd86bb 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -24,7 +24,8 @@ unzip -q rawdata.zip mkdir data # 2. Move the ./rawdata directory to ./data/raw mkdir -p data/raw -mv rawdata data/raw +mv rawdata/* data/raw/ +rmdir rawdata # 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