Skip to content

Updated update script to handle renamed files better #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bryce13950 merged 2 commits into from
May 23, 2025
Merged

Updated update script to handle renamed files better #62

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a3b744
made sure files are renamed properly
bryce13950 May 23, 2025
3bd4216
modified update script to copy from main repo
bryce13950 May 23, 2025
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
47 changes: 25 additions & 22 deletions update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,26 @@ RENAMED=()

while IFS= read -r line; do
STATUS=$(echo "$line" | awk '{print $1}')
FILE=$(echo "$line" | awk '{print $2}')
if [[ "$FILE" == app/Providers/* || "$FILE" == UPGRADE*.md || "$FILE" == "update.sh" ]]; then
continue
fi
if [[ "$STATUS" == "A" || "$STATUS" == "M" ]]; then
ADDED_MODIFIED+=("$FILE")
elif [[ "$STATUS" == "D" ]]; then
DELETED+=("$FILE")
elif [[ "$STATUS" == "R" ]]; then
if [[ "$STATUS" == "R"* ]]; then
# For renamed files, the format is "R<similarity> old_file new_file"
OLD_FILE=$(echo "$line" | awk '{print $2}')
NEW_FILE=$(echo "$line" | awk '{print $3}')
if [[ "$OLD_FILE" == app/Providers/* || "$OLD_FILE" == UPGRADE*.md || "$OLD_FILE" == "update.sh" ]]; then
continue
fi
RENAMED+=("$OLD_FILE|$NEW_FILE")
elif [[ "$STATUS" == "A" || "$STATUS" == "M" ]]; then
FILE=$(echo "$line" | awk '{print $2}')
if [[ "$FILE" == app/Providers/* || "$FILE" == UPGRADE*.md || "$FILE" == "update.sh" ]]; then
continue
fi
ADDED_MODIFIED+=("$FILE")
elif [[ "$STATUS" == "D" ]]; then
FILE=$(echo "$line" | awk '{print $2}')
if [[ "$FILE" == app/Providers/* || "$FILE" == UPGRADE*.md || "$FILE" == "update.sh" ]]; then
continue
fi
DELETED+=("$FILE")
fi
done <<< "$CHANGED"

Expand All @@ -46,23 +54,18 @@ for RENAME in "${RENAMED[@]}"; do
OLD_FILE=$(echo "$RENAME" | cut -d'|' -f1)
NEW_FILE=$(echo "$RENAME" | cut -d'|' -f2)

if [[ "$OLD_FILE" == app/Providers/* || "$OLD_FILE" == UPGRADE*.md || "$OLD_FILE" == "update.sh" ]]; then
continue
fi

OLD_PATH="$CHILD_PATH/$OLD_FILE"
NEW_PATH="$CHILD_PATH/$NEW_FILE"

# If the old file exists in child repo, move it to the new location
# Always copy the new file from the main repo to the new location in the child repo
mkdir -p "$(dirname "$NEW_PATH")"
cp "$NEW_FILE" "$NEW_PATH"
echo "Copied $NEW_FILE to $NEW_PATH in child repository (rename from $OLD_FILE)"

# If the old file exists in the child repo, delete it
if [ -f "$OLD_PATH" ]; then
mkdir -p "$(dirname "$NEW_PATH")"
mv "$OLD_PATH" "$NEW_PATH"
echo "Renamed $OLD_FILE to $NEW_FILE in child repository"
else
# If old file doesn't exist, just copy the new file
mkdir -p "$(dirname "$NEW_PATH")"
cp "$NEW_FILE" "$NEW_PATH"
echo "Copied $NEW_FILE to child repository (rename from $OLD_FILE)"
rm "$OLD_PATH"
echo "Deleted old file $OLD_PATH in child repository (renamed to $NEW_FILE)"
fi
done

Expand Down