From e976b55a5c2a83f4f2ab1221ea228c9b8737db4f Mon Sep 17 00:00:00 2001 From: Simeon Wong Date: Thu, 14 Nov 2024 20:32:09 -0500 Subject: [PATCH 1/4] 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/4] 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 4c3831df052e2fff52cf3c9e8e0bbc9cc7cb3671 Mon Sep 17 00:00:00 2001 From: Khoren Date: Fri, 18 Apr 2025 16:41:54 -0400 Subject: [PATCH 3/4] Final commit for assignment.sh shell scripting task --- 02_activities/assignments/assignment.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 2fbb9c81d..64a8b9592 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -19,22 +19,33 @@ unzip -q rawdata.zip ########################################### # Complete assignment here +mkdir data # 1. Create a directory named data +mv rawdata data/raw # 2. Move the ./rawdata directory to ./data/raw +mkdir -p data/processed/{server_logs,user_logs,event_logs} # 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,user_logs,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 -f data/raw/*ipaddr* +rm -f data/processed/user_logs/*ipaddr* # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed +find data/processed -type f > data/inventory.txt ########################################### From 7190b3915e08a7131b3eee032f46be75de382dda Mon Sep 17 00:00:00 2001 From: Khoren Date: Fri, 18 Apr 2025 17:17:39 -0400 Subject: [PATCH 4/4] Fix merge conflicts and finalize assignment.sh --- 02_activities/assignments/assignment.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 004c6c896..c0504a69b 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -42,7 +42,6 @@ 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 rm -f data/raw/*ipaddr* rm -f data/processed/user_logs/*ipaddr*