mirror of
https://github.com/SerenityOS/serenity
synced 2024-10-04 23:19:27 +00:00
Meta: Expect sync-local.sh script at repository root
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:
parent
c7ca0a5fef
commit
a3da5bc925
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -40,3 +40,4 @@ compile_commands.json
|
||||||
Ports/packages.db
|
Ports/packages.db
|
||||||
.idea/
|
.idea/
|
||||||
cmake-build-debug/
|
cmake-build-debug/
|
||||||
|
sync-local.sh
|
||||||
|
|
1
Kernel/.gitignore
vendored
1
Kernel/.gitignore
vendored
|
@ -1,4 +1,3 @@
|
||||||
kernel.map
|
kernel.map
|
||||||
sync-local.sh
|
|
||||||
*.pcap
|
*.pcap
|
||||||
eth_null*
|
eth_null*
|
||||||
|
|
|
@ -125,7 +125,22 @@ ln -s checksum mnt/bin/sha256sum
|
||||||
ln -s checksum mnt/bin/sha512sum
|
ln -s checksum mnt/bin/sha512sum
|
||||||
echo "done"
|
echo "done"
|
||||||
|
|
||||||
# Run local sync script, if it exists
|
if [ -f "${SERENITY_ROOT}/Kernel/sync-local.sh" ] || [ -f "${SERENITY_ROOT}/Build/sync-local.sh" ]; then
|
||||||
if [ -f sync-local.sh ]; then
|
# TODO: Deprecated on 2021-01-30. In a few months, remove this 'if'.
|
||||||
sh sync-local.sh
|
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
|
fi
|
||||||
|
|
Loading…
Reference in a new issue