From 9614261847083a35cc5812278ad2729333546910 Mon Sep 17 00:00:00 2001
From: Diana <sudianayang@gmail.com>
Date: Tue, 7 Oct 2025 17:59:45 -0400
Subject: [PATCH 1/2] try #3 to fix merge

---
 02_activities/assignments/assignment.sh | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh
index 8af8dc092..c58d2dff1 100644
--- a/02_activities/assignments/assignment.sh
+++ b/02_activities/assignments/assignment.sh
@@ -28,21 +28,28 @@ unzip -q rawdata.zip
 # Complete assignment here
 
 # 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
-
+cd newproject
+cd data
+mkdir processed
+mkdir processed/server_logs processed/user_logs processed/event_logs
+cd ..
 # 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/processed/user_logs/*ipaddr*
+rm data/raw/*ipaddr*
 # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed
-
+touch data/inventory.txt
+find data/processed -type f >> data/inventory.txt
 
 ###########################################
 

From 9daab7716ee6c5c1729a5467b4c8353fa2e712c2 Mon Sep 17 00:00:00 2001
From: Diana <sudianayang@gmail.com>
Date: Tue, 7 Oct 2025 21:03:30 -0400
Subject: [PATCH 2/2] part 2 incl

---
 02_activities/assignments/assignment.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh
index c58d2dff1..ffe0b300a 100644
--- a/02_activities/assignments/assignment.sh
+++ b/02_activities/assignments/assignment.sh
@@ -51,6 +51,9 @@ rm data/raw/*ipaddr*
 touch data/inventory.txt
 find data/processed -type f >> data/inventory.txt
 
+#jsdfsdfsddfs
+#jsdjfskdfs
+
 ###########################################
 
 echo "Project setup is complete!"