Skip to content

Commit

Permalink
Meta: Expect sync-local.sh script at repository root
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
linusg authored and awesomekling committed Jan 30, 2021
1 parent c7ca0a5 commit a3da5bc
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ compile_commands.json
Ports/packages.db
.idea/
cmake-build-debug/
sync-local.sh
1 change: 0 additions & 1 deletion Kernel/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
kernel.map
sync-local.sh
*.pcap
eth_null*
19 changes: 17 additions & 2 deletions Meta/build-root-filesystem.sh
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,22 @@ ln -s checksum mnt/bin/sha256sum
ln -s checksum mnt/bin/sha512sum
echo "done"

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 sync-local.sh ]; then
sh sync-local.sh
if [ -f "$SERENITY_ROOT}/sync-local.sh" ]; then
sh "${SERENITY_ROOT}/sync-local.sh"
fi

0 comments on commit a3da5bc

Please sign in to comment.