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 c0f5dc38e5b60798243db5d6ef8a422f291ebcaf Mon Sep 17 00:00:00 2001 From: Sanhavy Vadivel Date: Sun, 12 Apr 2026 22:15:02 -0400 Subject: [PATCH 3/5] commit 1 assignment --- 02_activities/assignments/assignment.sh | 26 ++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 4b48cec8b..392522f21 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -28,23 +28,31 @@ unzip -q rawdata.zip # Complete assignment here # 1. Create a directory named data - +mkdir data # 2. Move the ./rawdata directory to ./data/raw (eg. move it into ./data and rename it to raw) - +mv rawdata data +cd data +mv rawdata raw # 3. List the contents of the ./data/raw directory - +cd raw +ls # 4. Create the directory ./data/processed, # then create the following sub-directories within it: server_logs, user_logs, and event_logs - +cd .. +mkdir processed +cd processed +mkdir 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 ../raw/server* ../processed/server_logs # 6. Repeat the above step for user logs and event logs - +cp ../raw/user* ../processed/user_logs +cp ../raw/event* ../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 ../raw/*ipaddr* +rm ../processed/user_logs/*ipaddr* # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed - - +touch ../inventory.txt +ls -R ../processed > inventory.txt ########################################### echo "Project setup is complete!" From 52aa2aeab4ea1be99580af9ce839edc9dbcb152c Mon Sep 17 00:00:00 2001 From: Sanhavy Vadivel Date: Mon, 13 Apr 2026 11:37:20 -0400 Subject: [PATCH 4/5] changes made 2 --- 02_activities/assignments/assignment.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh index 8467893fd..ac17bd08a 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -35,11 +35,9 @@ mv rawdata data cd data mv rawdata raw # 3. List the contents of the ./data/raw directory -cd raw -ls +ls raw # 4. Create the directory ./data/processed, # then create the following sub-directories within it: server_logs, user_logs, and event_logs -cd .. mkdir processed cd processed mkdir server_logs user_logs event_logs @@ -49,16 +47,12 @@ cp ../raw/server* ../processed/server_logs cp ../raw/user* ../processed/user_logs cp ../raw/event* ../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 ../raw/*ipaddr* rm ../processed/user_logs/*ipaddr* -======= -rf -rf ./data - ->>>>>>> ea20676d33161a6f4d0fcd3c4f7aa5360f0f4309 # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed -touch ../inventory.txt -ls -R ../processed > inventory.txt +ls -R ../processed > ../inventory.txt ########################################### echo "Project setup is complete!" + +git pull https://github.com/UofT-DSI/shell coworker-changes --no-rebase \ No newline at end of file From 77e45626d85e9e07f2a219fec120fa5a5bf12f9a Mon Sep 17 00:00:00 2001 From: Sanhavy Vadivel Date: Mon, 13 Apr 2026 12:36:30 -0400 Subject: [PATCH 5/5] changed directory for ls question 2 --- 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 ac17bd08a..06c2c29c0 100644 --- a/02_activities/assignments/assignment.sh +++ b/02_activities/assignments/assignment.sh @@ -35,7 +35,7 @@ mv rawdata data cd data mv rawdata raw # 3. List the contents of the ./data/raw directory -ls raw +ls ./data/raw # 4. Create the directory ./data/processed, # then create the following sub-directories within it: server_logs, user_logs, and event_logs mkdir processed