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 53dfc877056f6b9881979a0373c508108bb9f275 Mon Sep 17 00:00:00 2001 From: Thomas Young Date: Tue, 29 Sep 2026 12:18:06 -0400 Subject: [PATCH 3/6] Finished assignment 1 --- .../assignments/assignment_script.sh | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/02_activities/assignments/assignment_script.sh b/02_activities/assignments/assignment_script.sh index 4b48cec8b..dfad3364e 100644 --- a/02_activities/assignments/assignment_script.sh +++ b/02_activities/assignments/assignment_script.sh @@ -24,6 +24,36 @@ touch analysis/main.py curl -Lo rawdata.zip https://github.com/UofT-DSI/shell/raw/refs/heads/main/02_activities/assignments/rawdata.zip unzip -q rawdata.zip +#creating directories for data storage +mkdir data +mv rawdata data/raw +ls data/raw +mkdir data/processed +mkdir data/processed/server_logs +mkdir data/processed/user_logs +mkdir data/processed/event_logs + +#organize raw files into respective directories +cp data/raw/*server**log* data/processed/server_logs +cp data/raw/*user* data/processed/user_logs +cp data/raw/*event* data/processed/event_logs + +#removed for privacy concerns +rm data/raw/*ipaddr* +rm data/processed/user_logs/*ipaddr* + +#Text file with list files in subfolders +touch inventory.txt + +echo "===== server_logs =====" >> inventory.txt +ls data/processed/server_logs >> inventory.txt + +echo "===== user_logs =====" >> inventory.txt +ls data/processed/user_logs >> inventory.txt + +echo "===== event_logs =====" >> inventory.txt +ls data/processed/event_logs >> inventory.txt + ########################################### # Complete assignment here From 0aac4ed7865d4d080b7425583d5d423bbf97482d Mon Sep 17 00:00:00 2001 From: Thomas Young Date: Sun, 4 Oct 2026 08:28:53 -0400 Subject: [PATCH 4/6] Revert "Merge branch 'coworker-changes' of https://github.com/UofT-DSI/shell into assignment_shell" This reverts commit 12ba37011b6f9b40df24cc6d7c69c16dee391bdc, reversing changes made to 53dfc877056f6b9881979a0373c508108bb9f275. --- 02_activities/assignments/assignment_script.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/02_activities/assignments/assignment_script.sh b/02_activities/assignments/assignment_script.sh index b8634dc26..dfad3364e 100644 --- a/02_activities/assignments/assignment_script.sh +++ b/02_activities/assignments/assignment_script.sh @@ -18,7 +18,6 @@ cd newproject mkdir analysis output touch README.md -echo "# Project Name: DSI Consulting Inc." > README.md touch analysis/main.py # download client data @@ -72,7 +71,6 @@ ls data/processed/event_logs >> inventory.txt # 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 f803ec5a66f77c54064d39d3cd283c3e3cfa9394 Mon Sep 17 00:00:00 2001 From: Thomas Young Date: Sun, 4 Oct 2026 09:58:27 -0400 Subject: [PATCH 5/6] Incorporate coworker README update --- 02_activities/assignments/assignment_script.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/02_activities/assignments/assignment_script.sh b/02_activities/assignments/assignment_script.sh index dfad3364e..943a255dd 100644 --- a/02_activities/assignments/assignment_script.sh +++ b/02_activities/assignments/assignment_script.sh @@ -18,6 +18,7 @@ cd newproject mkdir analysis output touch README.md +echo "# Project Name: DSI Consulting Inc." > README.md touch analysis/main.py # download client data From d028805b1f8b07dd834540086074cd3e2e247815 Mon Sep 17 00:00:00 2001 From: Thomas Young Date: Sun, 4 Oct 2026 14:44:16 -0400 Subject: [PATCH 6/6] Fix inventory file location --- 02_activities/assignments/assignment_script.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/02_activities/assignments/assignment_script.sh b/02_activities/assignments/assignment_script.sh index 943a255dd..7b6660364 100644 --- a/02_activities/assignments/assignment_script.sh +++ b/02_activities/assignments/assignment_script.sh @@ -44,16 +44,16 @@ rm data/raw/*ipaddr* rm data/processed/user_logs/*ipaddr* #Text file with list files in subfolders -touch inventory.txt +touch data/inventory.txt -echo "===== server_logs =====" >> inventory.txt -ls data/processed/server_logs >> inventory.txt +echo "===== server_logs =====" >> data/inventory.txt +ls data/processed/server_logs >> data/inventory.txt -echo "===== user_logs =====" >> inventory.txt -ls data/processed/user_logs >> inventory.txt +echo "===== user_logs =====" >> data/inventory.txt +ls data/processed/user_logs >> data/inventory.txt -echo "===== event_logs =====" >> inventory.txt -ls data/processed/event_logs >> inventory.txt +echo "===== event_logs =====" >> data/inventory.txt +ls data/processed/event_logs >> data/inventory.txt ########################################### # Complete assignment here