Skip to content

[4.0] Improve the generator tool for lists of files and folders to be removed or renamed on update#19

Closed
richard67 wants to merge 2 commits into4.0-devfrom
4.0-dev-deleted-files-and-folders-improvements-1
Closed

[4.0] Improve the generator tool for lists of files and folders to be removed or renamed on update#19
richard67 wants to merge 2 commits into4.0-devfrom
4.0-dev-deleted-files-and-folders-improvements-1

Conversation

@richard67
Copy link
Copy Markdown
Owner

@richard67 richard67 commented Jul 20, 2021 •
edited
Loading

Pull Request for Issue # .

Summary of Changes

This pull request (PR) is just to document the changed deleted files and folders generator script which I am currently using to generate the lists for updating script.php.

The change here is to optionally ignore results from another comparison depending on new, optional parameters, so that when comparing e.g. 4.0 RC 4 with RC 3, files and folders are not added if they are already present in the results from comparing the latest 4.0 with the latest 3.0.

Testing Instructions

Currently I use following Bash script to generate the lists:

#!/usr/bin/env bash

# Function for appending file with a comment if not empty
function appendFile {
	if [ -s $2 ]
	then
		echo $1 >> $3
		cat $2 >> $3
		echo "" >> $3
	fi
}

# Remove any old results
rm -f ./deleted_files*.txt
rm -f ./deleted_folders*.txt
rm -f ./renamed_files*.txt

# From 3.10-dev to 4.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_3.10.4-dev-Development-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.5-dev-Development-Full_Package
mv ./deleted_files.txt ./deleted_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_folders.txt ./deleted_folders_3.10-dev_to_4.0-dev.txt
mv ./renamed_files.txt ./renamed_files_3.10-dev_to_4.0-dev.txt

# From 4.0.0 Beta 1 to 4.0.0 Beta 2 - ignore results from 3.10-dev to 4.0.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-beta1-Beta-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-beta2-Beta-Full_Package \
    --prevDelFiles=./deleted_files_3.10-dev_to_4.0-dev.txt \
    --prevDelFolders=./deleted_folders_3.10-dev_to_4.0-dev.txt \
    --prevRenFiles=./renamed_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_files.txt ./deleted_files_4.0.0-Beta-1_to_4.0.0-Beta-2.txt
mv ./deleted_folders.txt ./deleted_folders_4.0.0-Beta-1_to_4.0.0-Beta-2.txt
mv ./renamed_files.txt ./renamed_files_4.0.0-Beta-1_to_4.0.0-Beta-2.txt

# From 4.0.0 Beta 2 to 4.0.0 Beta 3 - ignore results from 3.10-dev to 4.0.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-beta2-Beta-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-beta3-Beta-Full_Package \
    --prevDelFiles=./deleted_files_3.10-dev_to_4.0-dev.txt \
    --prevDelFolders=./deleted_folders_3.10-dev_to_4.0-dev.txt \
    --prevRenFiles=./renamed_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_files.txt ./deleted_files_4.0.0-Beta-2_to_4.0.0-Beta-3.txt
mv ./deleted_folders.txt ./deleted_folders_4.0.0-Beta-2_to_4.0.0-Beta-3.txt
mv ./renamed_files.txt ./renamed_files_4.0.0-Beta-2_to_4.0.0-Beta-3.txt

# From 4.0.0 Beta 3 to 4.0.0 Beta 4 - ignore results from 3.10-dev to 4.0.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-beta3-Beta-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-beta4-Beta-Full_Package \
    --prevDelFiles=./deleted_files_3.10-dev_to_4.0-dev.txt \
    --prevDelFolders=./deleted_folders_3.10-dev_to_4.0-dev.txt \
    --prevRenFiles=./renamed_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_files.txt ./deleted_files_4.0.0-Beta-3_to_4.0.0-Beta-4.txt
mv ./deleted_folders.txt ./deleted_folders_4.0.0-Beta-3_to_4.0.0-Beta-4.txt
mv ./renamed_files.txt ./renamed_files_4.0.0-Beta-3_to_4.0.0-Beta-4.txt

# From 4.0.0 Beta 4 to 4.0.0 Beta 5 - ignore results from 3.10-dev to 4.0.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-beta4-Beta-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-beta5-Beta-Full_Package \
    --prevDelFiles=./deleted_files_3.10-dev_to_4.0-dev.txt \
    --prevDelFolders=./deleted_folders_3.10-dev_to_4.0-dev.txt \
    --prevRenFiles=./renamed_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_files.txt ./deleted_files_4.0.0-Beta-4_to_4.0.0-Beta-5.txt
mv ./deleted_folders.txt ./deleted_folders_4.0.0-Beta-4_to_4.0.0-Beta-5.txt
mv ./renamed_files.txt ./renamed_files_4.0.0-Beta-4_to_4.0.0-Beta-5.txt

# From 4.0.0 Beta 5 to 4.0.0 Beta 6 - ignore results from 3.10-dev to 4.0.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-beta5-Beta-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-beta6-Beta-Full_Package \
    --prevDelFiles=./deleted_files_3.10-dev_to_4.0-dev.txt \
    --prevDelFolders=./deleted_folders_3.10-dev_to_4.0-dev.txt \
    --prevRenFiles=./renamed_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_files.txt ./deleted_files_4.0.0-Beta-5_to_4.0.0-Beta-6.txt
mv ./deleted_folders.txt ./deleted_folders_4.0.0-Beta-5_to_4.0.0-Beta-6.txt
mv ./renamed_files.txt ./renamed_files_4.0.0-Beta-5_to_4.0.0-Beta-6.txt

# From 4.0.0 Beta 6 to 4.0.0 Beta 7 - ignore results from 3.10-dev to 4.0.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-beta6-Beta-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-beta7-Beta-Full_Package \
    --prevDelFiles=./deleted_files_3.10-dev_to_4.0-dev.txt \
    --prevDelFolders=./deleted_folders_3.10-dev_to_4.0-dev.txt \
    --prevRenFiles=./renamed_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_files.txt ./deleted_files_4.0.0-Beta-6_to_4.0.0-Beta-7.txt
mv ./deleted_folders.txt ./deleted_folders_4.0.0-Beta-6_to_4.0.0-Beta-7.txt
mv ./renamed_files.txt ./renamed_files_4.0.0-Beta-6_to_4.0.0-Beta-7.txt

# From 4.0.0 Beta 7 to 4.0.0 RC 1 - ignore results from 3.10-dev to 4.0.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-beta7-Beta-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-rc1-Release_Candidate-Full_Package \
    --prevDelFiles=./deleted_files_3.10-dev_to_4.0-dev.txt \
    --prevDelFolders=./deleted_folders_3.10-dev_to_4.0-dev.txt \
    --prevRenFiles=./renamed_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_files.txt ./deleted_files_4.0.0-Beta-7_to_4.0.0-RC-1.txt
mv ./deleted_folders.txt ./deleted_folders_4.0.0-Beta-7_to_4.0.0-RC-1.txt
mv ./renamed_files.txt ./renamed_files_4.0.0-Beta-7_to_4.0.0-RC-1.txt

# From 4.0.0 RC 1 to RC 2 - ignore results from 3.10-dev to 4.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-rc1-Release_Candidate-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-rc2-Release_Candidate-Full_Package \
    --prevDelFiles=./deleted_files_3.10-dev_to_4.0-dev.txt \
    --prevDelFolders=./deleted_folders_3.10-dev_to_4.0-dev.txt \
    --prevRenFiles=./renamed_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_files.txt ./deleted_files_4.0.0-RC-1_to_4.0.0-RC-2.txt
mv ./deleted_folders.txt ./deleted_folders_4.0.0-RC-1_to_4.0.0-RC-2.txt
mv ./renamed_files.txt ./renamed_files_4.0.0-RC-1_to_4.0.0-RC-2.txt

# From 4.0.0 RC 2 to RC 3 - ignore results from 3.10-dev to 4.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-rc2-Release_Candidate-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-rc3-Release_Candidate-Full_Package \
    --prevDelFiles=./deleted_files_3.10-dev_to_4.0-dev.txt \
    --prevDelFolders=./deleted_folders_3.10-dev_to_4.0-dev.txt \
    --prevRenFiles=./renamed_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_files.txt ./deleted_files_4.0.0-RC-2_to_4.0.0-RC-3.txt
mv ./deleted_folders.txt ./deleted_folders_4.0.0-RC-2_to_4.0.0-RC-3.txt
mv ./renamed_files.txt ./renamed_files_4.0.0-RC-2_to_4.0.0-RC-3.txt

# From 4.0.0 RC 3 to RC 4 - ignore results from 3.10-dev to 4.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-rc3-Release_Candidate-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-rc4-Release_Candidate-Full_Package \
    --prevDelFiles=./deleted_files_3.10-dev_to_4.0-dev.txt \
    --prevDelFolders=./deleted_folders_3.10-dev_to_4.0-dev.txt \
    --prevRenFiles=./renamed_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_files.txt ./deleted_files_4.0.0-RC-3_to_4.0.0-RC-4.txt
mv ./deleted_folders.txt ./deleted_folders_4.0.0-RC-3_to_4.0.0-RC-4.txt
mv ./renamed_files.txt ./renamed_files_4.0.0-RC-3_to_4.0.0-RC-4.txt

# From 4.0.0 RC 4 to RC 5 - ignore results from 3.10-dev to 4.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-rc4-Release_Candidate-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-rc5-Release_Candidate-Full_Package \
    --prevDelFiles=./deleted_files_3.10-dev_to_4.0-dev.txt \
    --prevDelFolders=./deleted_folders_3.10-dev_to_4.0-dev.txt \
    --prevRenFiles=./renamed_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_files.txt ./deleted_files_4.0.0-RC-4_to_4.0.0-RC-5.txt
mv ./deleted_folders.txt ./deleted_folders_4.0.0-RC-4_to_4.0.0-RC-5.txt
mv ./renamed_files.txt ./renamed_files_4.0.0-RC-4_to_4.0.0-RC-5.txt

# From 4.0.0 RC 5 to RC 6 - ignore results from 3.10-dev to 4.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-rc5-Release_Candidate-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-rc6-Release_Candidate-Full_Package \
    --prevDelFiles=./deleted_files_3.10-dev_to_4.0-dev.txt \
    --prevDelFolders=./deleted_folders_3.10-dev_to_4.0-dev.txt \
    --prevRenFiles=./renamed_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_files.txt ./deleted_files_4.0.0-RC-5_to_4.0.0-RC-6.txt
mv ./deleted_folders.txt ./deleted_folders_4.0.0-RC-5_to_4.0.0-RC-6.txt
mv ./renamed_files.txt ./renamed_files_4.0.0-RC-5_to_4.0.0-RC-6.txt

# From 4.0.0 RC 6 to 4.0.0 (stable) - ignore results from 3.10-dev to 4.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-rc6-Release_Candidate-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-Stable-Full_Package \
    --prevDelFiles=./deleted_files_3.10-dev_to_4.0-dev.txt \
    --prevDelFolders=./deleted_folders_3.10-dev_to_4.0-dev.txt \
    --prevRenFiles=./renamed_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_files.txt ./deleted_files_4.0.0-RC-6_to_4.0.0.txt
mv ./deleted_folders.txt ./deleted_folders_4.0.0-RC-6_to_4.0.0.txt
mv ./renamed_files.txt ./renamed_files_4.0.0-RC-6_to_4.0.0.txt

# From 4.0.0 to 4.0.1 - ignore results from 3.10-dev to 4.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.0-Stable-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.1-Stable-Full_Package \
    --prevDelFiles=./deleted_files_3.10-dev_to_4.0-dev.txt \
    --prevDelFolders=./deleted_folders_3.10-dev_to_4.0-dev.txt \
    --prevRenFiles=./renamed_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_files.txt ./deleted_files_4.0.0_to_4.0.1.txt
mv ./deleted_folders.txt ./deleted_folders_4.0.0_to_4.0.1.txt
mv ./renamed_files.txt ./renamed_files_4.0.0_to_4.0.1.txt

# From 4.0.1 to 4.0.2 - ignore results from 3.10-dev to 4.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.1-Stable-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.2-Stable-Full_Package \
    --prevDelFiles=./deleted_files_3.10-dev_to_4.0-dev.txt \
    --prevDelFolders=./deleted_folders_3.10-dev_to_4.0-dev.txt \
    --prevRenFiles=./renamed_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_files.txt ./deleted_files_4.0.1_to_4.0.2.txt
mv ./deleted_folders.txt ./deleted_folders_4.0.1_to_4.0.2.txt
mv ./renamed_files.txt ./renamed_files_4.0.1_to_4.0.2.txt

# From 4.0.2 to 4.0.3 - ignore results from 3.10-dev to 4.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.2-Stable-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.3-Stable-Full_Package \
    --prevDelFiles=./deleted_files_3.10-dev_to_4.0-dev.txt \
    --prevDelFolders=./deleted_folders_3.10-dev_to_4.0-dev.txt \
    --prevRenFiles=./renamed_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_files.txt ./deleted_files_4.0.2_to_4.0.3.txt
mv ./deleted_folders.txt ./deleted_folders_4.0.2_to_4.0.3.txt
mv ./renamed_files.txt ./renamed_files_4.0.2_to_4.0.3.txt

# From 4.0.3 to 4.0.4 - ignore results from 3.10-dev to 4.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.3-Stable-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.4-Stable-Full_Package \
    --prevDelFiles=./deleted_files_3.10-dev_to_4.0-dev.txt \
    --prevDelFolders=./deleted_folders_3.10-dev_to_4.0-dev.txt \
    --prevRenFiles=./renamed_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_files.txt ./deleted_files_4.0.3_to_4.0.4.txt
mv ./deleted_folders.txt ./deleted_folders_4.0.3_to_4.0.4.txt
mv ./renamed_files.txt ./renamed_files_4.0.3_to_4.0.4.txt

# From 4.0.4 to 4.0-dev - ignore results from 3.10-dev to 4.0-dev
php ./deleted_file_check.php \
    --from=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.4-Stable-Full_Package \
    --to=/home/richard/lamp/public_html/4.0-compare-releases/Joomla_4.0.5-dev-Development-Full_Package \
    --prevDelFiles=./deleted_files_3.10-dev_to_4.0-dev.txt \
    --prevDelFolders=./deleted_folders_3.10-dev_to_4.0-dev.txt \
    --prevRenFiles=./renamed_files_3.10-dev_to_4.0-dev.txt
mv ./deleted_files.txt ./deleted_files_4.0.3_to_4.0-dev.txt
mv ./deleted_folders.txt ./deleted_folders_4.0.3_to_4.0-dev.txt
mv ./renamed_files.txt ./renamed_files_4.0.3_to_4.0-dev.txt

# Combine the files
appendFile "// From 3.10 to 4.0"                ./deleted_files_3.10-dev_to_4.0-dev.txt          ./deleted_files.txt
appendFile "// 4.0 from Beta 1 to Beta 2"       ./deleted_files_4.0.0-Beta-1_to_4.0.0-Beta-2.txt ./deleted_files.txt
appendFile "// 4.0 from Beta 2 to Beta 3"       ./deleted_files_4.0.0-Beta-2_to_4.0.0-Beta-3.txt ./deleted_files.txt
appendFile "// 4.0 from Beta 3 to Beta 4"       ./deleted_files_4.0.0-Beta-3_to_4.0.0-Beta-4.txt ./deleted_files.txt
appendFile "// 4.0 from Beta 4 to Beta 5"       ./deleted_files_4.0.0-Beta-4_to_4.0.0-Beta-5.txt ./deleted_files.txt
appendFile "// 4.0 from Beta 5 to Beta 6"       ./deleted_files_4.0.0-Beta-5_to_4.0.0-Beta-6.txt ./deleted_files.txt
appendFile "// 4.0 from Beta 6 to Beta 7"       ./deleted_files_4.0.0-Beta-6_to_4.0.0-Beta-7.txt ./deleted_files.txt
appendFile "// 4.0 from Beta 7 to RC 1"         ./deleted_files_4.0.0-Beta-7_to_4.0.0-RC-1.txt   ./deleted_files.txt
appendFile "// 4.0 from RC 1 to RC 2"           ./deleted_files_4.0.0-RC-1_to_4.0.0-RC-2.txt     ./deleted_files.txt
appendFile "// 4.0 from RC 2 to RC 3"           ./deleted_files_4.0.0-RC-2_to_4.0.0-RC-3.txt     ./deleted_files.txt
appendFile "// 4.0 from RC 3 to RC 4"           ./deleted_files_4.0.0-RC-3_to_4.0.0-RC-4.txt     ./deleted_files.txt
appendFile "// 4.0 from RC 4 to RC 5"           ./deleted_files_4.0.0-RC-4_to_4.0.0-RC-5.txt     ./deleted_files.txt
appendFile "// 4.0 from RC 5 to RC 6"           ./deleted_files_4.0.0-RC-5_to_4.0.0-RC-6.txt     ./deleted_files.txt
appendFile "// 4.0 from RC 6 to 4.0.0 (stable)" ./deleted_files_4.0.0-RC-6_to_4.0.0.txt          ./deleted_files.txt
appendFile "// From 4.0.0 to 4.0.1"             ./deleted_files_4.0.0_to_4.0.1.txt               ./deleted_files.txt
appendFile "// From 4.0.1 to 4.0.2"             ./deleted_files_4.0.1_to_4.0.2.txt               ./deleted_files.txt
appendFile "// From 4.0.2 to 4.0.3"             ./deleted_files_4.0.2_to_4.0.3.txt               ./deleted_files.txt
appendFile "// From 4.0.3 to 4.0.4"             ./deleted_files_4.0.3_to_4.0.4.txt               ./deleted_files.txt
appendFile "// From 4.0.4 to 4.0.5"             ./deleted_files_4.0.4_to_4.0-dev.txt             ./deleted_files.txt

appendFile "// From 3.10 to 4.0"                ./deleted_folders_3.10-dev_to_4.0-dev.txt          ./deleted_folders.txt
appendFile "// 4.0 from Beta 1 to Beta 2"       ./deleted_folders_4.0.0-Beta-1_to_4.0.0-Beta-2.txt ./deleted_folders.txt
appendFile "// 4.0 from Beta 2 to Beta 3"       ./deleted_folders_4.0.0-Beta-2_to_4.0.0-Beta-3.txt ./deleted_folders.txt
appendFile "// 4.0 from Beta 3 to Beta 4"       ./deleted_folders_4.0.0-Beta-3_to_4.0.0-Beta-4.txt ./deleted_folders.txt
appendFile "// 4.0 from Beta 4 to Beta 5"       ./deleted_folders_4.0.0-Beta-4_to_4.0.0-Beta-5.txt ./deleted_folders.txt
appendFile "// 4.0 from Beta 5 to Beta 6"       ./deleted_folders_4.0.0-Beta-5_to_4.0.0-Beta-6.txt ./deleted_folders.txt
appendFile "// 4.0 from Beta 6 to Beta 7"       ./deleted_folders_4.0.0-Beta-6_to_4.0.0-Beta-7.txt ./deleted_folders.txt
appendFile "// 4.0 from Beta 7 to RC 1"         ./deleted_folders_4.0.0-Beta-7_to_4.0.0-RC-1.txt   ./deleted_folders.txt
appendFile "// 4.0 from RC 1 to RC 2"           ./deleted_folders_4.0.0-RC-1_to_4.0.0-RC-2.txt     ./deleted_folders.txt
appendFile "// 4.0 from RC 2 to RC 3"           ./deleted_folders_4.0.0-RC-2_to_4.0.0-RC-3.txt     ./deleted_folders.txt
appendFile "// 4.0 from RC 3 to RC 4"           ./deleted_folders_4.0.0-RC-3_to_4.0.0-RC-4.txt     ./deleted_folders.txt
appendFile "// 4.0 from RC 4 to RC 5"           ./deleted_folders_4.0.0-RC-4_to_4.0.0-RC-5.txt     ./deleted_folders.txt
appendFile "// 4.0 from RC 5 to RC 6"           ./deleted_folders_4.0.0-RC-5_to_4.0.0-RC-6.txt     ./deleted_folders.txt
appendFile "// 4.0 from RC 6 to 4.0.0 (stable)" ./deleted_folders_4.0.0-RC-6_to_4.0.0.txt          ./deleted_folders.txt
appendFile "// From 4.0.0 to 4.0.1"             ./deleted_folders_4.0.0_to_4.0.1.txt               ./deleted_folders.txt
appendFile "// From 4.0.1 to 4.0.2"             ./deleted_folders_4.0.1_to_4.0.2.txt               ./deleted_folders.txt
appendFile "// From 4.0.2 to 4.0.3"             ./deleted_folders_4.0.2_to_4.0.3.txt               ./deleted_folders.txt
appendFile "// From 4.0.3 to 4.0.4"             ./deleted_folders_4.0.3_to_4.0.4.txt               ./deleted_folders.txt
appendFile "// From 4.0.4 to 4.0.5"             ./deleted_folders_4.0.4_to_4.0-dev.txt             ./deleted_folders.txt

appendFile "// From 3.10 to 4.0"                ./renamed_files_3.10-dev_to_4.0-dev.txt          ./renamed_files.txt
appendFile "// 4.0 from Beta 1 to Beta 2"       ./renamed_files_4.0.0-Beta-1_to_4.0.0-Beta-2.txt ./renamed_files.txt
appendFile "// 4.0 from Beta 2 to Beta 3"       ./renamed_files_4.0.0-Beta-2_to_4.0.0-Beta-3.txt ./renamed_files.txt
appendFile "// 4.0 from Beta 3 to Beta 4"       ./renamed_files_4.0.0-Beta-3_to_4.0.0-Beta-4.txt ./renamed_files.txt
appendFile "// 4.0 from Beta 4 to Beta 5"       ./renamed_files_4.0.0-Beta-4_to_4.0.0-Beta-5.txt ./renamed_files.txt
appendFile "// 4.0 from Beta 5 to Beta 6"       ./renamed_files_4.0.0-Beta-5_to_4.0.0-Beta-6.txt ./renamed_files.txt
appendFile "// 4.0 from Beta 6 to Beta 7"       ./renamed_files_4.0.0-Beta-6_to_4.0.0-Beta-7.txt ./renamed_files.txt
appendFile "// 4.0 from Beta 7 to RC 1"         ./renamed_files_4.0.0-Beta-7_to_4.0.0-RC-1.txt   ./renamed_files.txt
appendFile "// 4.0 from RC 1 to RC 2"           ./renamed_files_4.0.0-RC-1_to_4.0.0-RC-2.txt     ./renamed_files.txt
appendFile "// 4.0 from RC 2 to RC 3"           ./renamed_files_4.0.0-RC-2_to_4.0.0-RC-3.txt     ./renamed_files.txt
appendFile "// 4.0 from RC 3 to RC 4"           ./renamed_files_4.0.0-RC-3_to_4.0.0-RC-4.txt     ./renamed_files.txt
appendFile "// 4.0 from RC 4 to RC 5"           ./renamed_files_4.0.0-RC-4_to_4.0.0-RC-5.txt     ./renamed_files.txt
appendFile "// 4.0 from RC 5 to RC 6"           ./renamed_files_4.0.0-RC-5_to_4.0.0-RC-6.txt     ./renamed_files.txt
appendFile "// 4.0 from RC 6 to 4.0.0 (stable)" ./renamed_files_4.0.0-RC-6_to_4.0.0.txt          ./renamed_files.txt
appendFile "// From 4.0.0 to 4.0.1"             ./renamed_files_4.0.0_to_4.0.1.txt               ./renamed_files.txt
appendFile "// From 4.0.1 to 4.0.2"             ./renamed_files_4.0.1_to_4.0.2.txt               ./renamed_files.txt
appendFile "// From 4.0.2 to 4.0.3"             ./renamed_files_4.0.2_to_4.0.3.txt               ./renamed_files.txt
appendFile "// From 4.0.3 to 4.0.4"             ./renamed_files_4.0.3_to_4.0.4.txt               ./renamed_files.txt
appendFile "// From 4.0.4 to 4.0.5"             ./renamed_files_4.0.4_to_4.0-dev.txt             ./renamed_files.txt

# Remove intermediate results
rm -f ./deleted_files_*.txt
rm -f ./deleted_folders_*.txt
rm -f ./renamed_files_*.txt

When keeping the intermediate results from comparing older 4.0 versions since Beta 1, it only needs to do the first comparison from current 3.10-dev to current 4.0-dev and then the last 2 comparisons. The 2nd last because something might have been forgotten in script.php when the last release was made, and the last one for the last release and the current branch.

At the end I can take the complete content of each file, intend it by 3 tabs and copy it into script PHP and can see the changes in Git.

Then it needs only 2 manual steps:

  • Add back the intermediate 4.0.0 update SQL scripts which I had removed between 2 beta versions when combining the update SQL script, so the comparisons don't know about them.
  • Move deletion of folder "/libraries/vendor/paragonie/random_compat" from section "// From 3.10 to 4.0" to section "// 4.0 from Beta 7 to RC 1". The reason is that we have different child folders of that being deleted when updating from 3.10 or when updating from 4.0 Beta 7, so we get the folder 2 times, and the duplicate check added in this PR here will add it do the 1st and not to the 2nd section, but in this case it should be in the 2nd.

This can be automated later with further improvements, but the question now is if what I am doing here is the right way to go.

Actual result BEFORE applying this Pull Request

I have to identify and remove duplicates myself from the right section of the deleted files and folder lists in script.php.

Expected result AFTER applying this Pull Request

Files and folders which have been identified to be removed when updating from the previous major (or minor) release on another branch, e.g. in case of J4 from 3.10, are not to be removed again when updating from a previous version of the current release to be checked.

Documentation Changes Required

There is no documentation yet on how to use deleted_file_check.php.

@richard67 richard67 force-pushed the 4.0-dev-deleted-files-and-folders-improvements-1 branch from 5b24d89 to 447709b Compare July 22, 2021 07:34
@richard67 richard67 force-pushed the 4.0-dev-deleted-files-and-folders-improvements-1 branch from 447709b to 44bc8ac Compare August 8, 2021 20:18
@richard67 richard67 force-pushed the 4.0-dev-deleted-files-and-folders-improvements-1 branch from 44bc8ac to 8fac359 Compare October 17, 2021 18:03
@richard67 richard67 mentioned this pull request Oct 17, 2021
Merged
@richard67
Add parameters prevDelFiles, prevDelFolders and prevRenFiles
89993ed 
New optional parameters to exclude results from comparison with previous release, e.g. 3.10 from comparison for current release, e.g. 4.0.
@richard67
Include intermediate results in build/.gitignore
37230bf
@richard67 richard67 force-pushed the 4.0-dev-deleted-files-and-folders-improvements-1 branch from 8fac359 to 37230bf Compare November 12, 2021 12:26
@richard67
Copy link
Copy Markdown
Owner Author

richard67 commented Nov 12, 2021

Closing in favour of #20 .

@richard67 richard67 closed this Nov 12, 2021
@richard67 richard67 mentioned this pull request Dec 4, 2021
Closed
bembelimen added a commit that referenced this pull request Jan 23, 2022
@laoneo @bembelimen
[4.1] Do not double lock assets (joomla#36776)
6185157 
* Do not double lock assets

* db update

* Remove double asset lock (#19)

* Remove double asset lock

* Only remove lock

Co-authored-by: Benjamin Trenkle <bembelimen@users.noreply.github.com>
richard67 pushed a commit that referenced this pull request Jul 14, 2023
@bembelimen
Merge pull request #19 from joomla-projects/person
9385231 
Person Plugin
richard67 pushed a commit that referenced this pull request Feb 25, 2024
@SniperSister
Merge pull request #19 from tfeuerst/snipersister/tuf-j5
ad6714d 
Fix invalid canonical JSON of TargetsMetadata in php-tuf
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@richard67