0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Meta: Expect sync-local.sh script at repository root

Browse source 
This used to be in Kernel/, next to the build-root-filesystem.sh script,
which was then moved to Meta/ during the transition to CMake but has the
working directory set to Build/, effectively expecting it there - which
seems silly.

TL;DR: Very confusing. Use an explicit path relative to SERENITY_ROOT
instead and update the .gitignore files.
This commit is contained in:
Linus Groh 2021-01-30 00:24:54 +01:00 • committed by Andreas Kling
parent c7ca0a5fef
commit a3da5bc925
Notes: sideshowbarker 2024-07-18 22:44:54 +09:00
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -40,3 +40,4 @@ compile_commands.json
Ports/packages.db
.idea/
cmake-build-debug/
sync-local.sh

1
Kernel/.gitignore vendored
View file

@ -1,4 +1,3 @@
kernel.map
sync-local.sh
*.pcap
eth_null*

21
Meta/build-root-filesystem.sh
View file

@ -125,7 +125,22 @@ ln -s checksum mnt/bin/sha256sum
ln -s checksum mnt/bin/sha512sum
echo "done"
# Run local sync script, if it exists
if [ -f sync-local.sh ]; then
sh sync-local.sh
if [ -f "${SERENITY_ROOT}/Kernel/sync-local.sh" ] || [ -f "${SERENITY_ROOT}/Build/sync-local.sh" ]; then
# TODO: Deprecated on 2021-01-30. In a few months, remove this 'if'.
tput setaf 1
echo
echo " +-----------------------------------------------------------------------------+"
echo " | |"
echo " | WARNING: sync-local.sh, previously located in Kernel/ and later Build/ |"
echo " | must be moved to \$SERENITY_ROOT! |"
echo " | See https://github.com/SerenityOS/serenity/pull/5172 for details. |"
echo " | |"
echo " +-----------------------------------------------------------------------------+"
echo
tput sgr 0
fi
# Run local sync script, if it exists
if [ -f "$SERENITY_ROOT}/sync-local.sh" ]; then
sh "${SERENITY_ROOT}/sync-local.sh"
fi