diff options
| author | Linus Groh <mail@linusgroh.de> | 2021-01-30 00:24:54 +0100 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-01-30 09:18:46 +0100 |
| commit | a3da5bc925321f3625d77b640e85d1ebf55adf27 (patch) | |
| tree | 2296c07ba273e3b0ed31b21043d209c97dee5b84 /Meta | |
| parent | c7ca0a5fef126a25b7609a87958813029c6bce23 (diff) | |
| download | serenity-a3da5bc925321f3625d77b640e85d1ebf55adf27.zip | |
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.
Diffstat (limited to 'Meta')
| -rwxr-xr-x | Meta/build-root-filesystem.sh | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/Meta/build-root-filesystem.sh b/Meta/build-root-filesystem.sh index 0c8ff60360..6766ec01e3 100755 --- a/Meta/build-root-filesystem.sh +++ b/Meta/build-root-filesystem.sh @@ -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 |