Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 50 additions & 8 deletions 02_activities/assignments/assignment_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,23 +29,64 @@ 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/raw
# 3. List the contents of the ./data/raw directory

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 ./data/processed
mkdir ./data/processed/server_logs
mkdir ./data/processed/user_logs
mkdir ./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

touch ./data/inventory.txt
ls ./data/processed/*/* > ./data/inventory.txt

###########################################

echo "Project setup is complete!"
###########################################
# Part 2: Merge in Updates from Coworkers
###########################################

# 9. Pull changes from the coworker's branch
git pull https://github.com/UofT-DSI/shell coworker-changes --no-rebase

# 10. Check the repository for merge conflicts
git status

# 11. Check whether there are any unresolved merge conflicts
if git diff --name-only --diff-filter=U | grep -q .; then
echo "Merge conflicts detected!"
echo "The following files have conflicts:"
git diff --name-only --diff-filter=U
echo "Resolve the conflicts, then run:"
echo "git add <resolved-files>"
echo "git commit -m \"Merge coworker changes\""
exit 1
fi

# 12. If the merge completed without conflicts, show the result
echo "Coworker changes merged successfully."

# 13. Re-test the project setup
echo "Checking project files..."
ls ./data/raw
ls ./data/processed/server_logs
ls ./data/processed/user_logs
ls ./data/processed/event_logs
cat ./data/inventory.txt

###########################################

echo "Project setup is complete!"
Loading