mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 23:07:35 +00:00
Everywhere: Replace SERENITY_ROOT with SERENITY_SOURCE_DIR
This commit is contained in:
parent
3f5c934ea6
commit
e45e0eeb47
33 changed files with 69 additions and 69 deletions
|
@ -26,19 +26,19 @@ if [ "$(id -u)" != 0 ]; then
|
|||
die "this script needs to run as root"
|
||||
fi
|
||||
|
||||
[ -z "$SERENITY_ROOT" ] && die "SERENITY_ROOT is not set"
|
||||
[ -d "$SERENITY_ROOT/Base" ] || die "$SERENITY_ROOT/Base doesn't exist"
|
||||
[ -z "$SERENITY_SOURCE_DIR" ] && die "SERENITY_SOURCE_DIR is not set"
|
||||
[ -d "$SERENITY_SOURCE_DIR/Base" ] || die "$SERENITY_SOURCE_DIR/Base doesn't exist"
|
||||
|
||||
umask 0022
|
||||
|
||||
printf "installing base system... "
|
||||
$CP -PdR "$SERENITY_ROOT"/Base/* mnt/
|
||||
$CP "$SERENITY_ROOT"/Toolchain/Local/i686/i686-pc-serenity/lib/libgcc_s.so mnt/usr/lib/
|
||||
$CP -PdR "$SERENITY_SOURCE_DIR"/Base/* mnt/
|
||||
$CP "$SERENITY_SOURCE_DIR"/Toolchain/Local/i686/i686-pc-serenity/lib/libgcc_s.so mnt/usr/lib/
|
||||
$CP -PdR Root/* mnt/
|
||||
# If umask was 027 or similar when the repo was cloned,
|
||||
# file permissions in Base/ are too restrictive. Restore
|
||||
# the permissions needed in the image.
|
||||
chmod -R g+rX,o+rX "$SERENITY_ROOT"/Base/* mnt/
|
||||
chmod -R g+rX,o+rX "$SERENITY_SOURCE_DIR"/Base/* mnt/
|
||||
|
||||
chmod 660 mnt/etc/WindowServer/WindowServer.ini
|
||||
chown $window_uid:$window_gid mnt/etc/WindowServer/WindowServer.ini
|
||||
|
@ -96,9 +96,9 @@ mkdir -p mnt/home/anon
|
|||
mkdir -p mnt/home/anon/Desktop
|
||||
mkdir -p mnt/home/anon/Downloads
|
||||
mkdir -p mnt/home/nona
|
||||
cp "$SERENITY_ROOT"/README.md mnt/home/anon/
|
||||
cp -r "$SERENITY_ROOT"/Userland/Libraries/LibJS/Tests mnt/home/anon/js-tests
|
||||
cp -r "$SERENITY_ROOT"/Userland/Libraries/LibWeb/Tests mnt/home/anon/web-tests
|
||||
cp "$SERENITY_SOURCE_DIR"/README.md mnt/home/anon/
|
||||
cp -r "$SERENITY_SOURCE_DIR"/Userland/Libraries/LibJS/Tests mnt/home/anon/js-tests
|
||||
cp -r "$SERENITY_SOURCE_DIR"/Userland/Libraries/LibWeb/Tests mnt/home/anon/web-tests
|
||||
chmod 700 mnt/root
|
||||
chmod 700 mnt/home/anon
|
||||
chmod 700 mnt/home/nona
|
||||
|
@ -126,14 +126,14 @@ 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
|
||||
if [ -f "${SERENITY_SOURCE_DIR}/Kernel/sync-local.sh" ] || [ -f "${SERENITY_SOURCE_DIR}/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 " | must be moved to \$SERENITY_SOURCE_DIR! |"
|
||||
echo " | See https://github.com/SerenityOS/serenity/pull/5172 for details. |"
|
||||
echo " | |"
|
||||
echo " +-----------------------------------------------------------------------------+"
|
||||
|
@ -142,6 +142,6 @@ if [ -f "${SERENITY_ROOT}/Kernel/sync-local.sh" ] || [ -f "${SERENITY_ROOT}/Buil
|
|||
fi
|
||||
|
||||
# Run local sync script, if it exists
|
||||
if [ -f "${SERENITY_ROOT}/sync-local.sh" ]; then
|
||||
sh "${SERENITY_ROOT}/sync-local.sh"
|
||||
if [ -f "${SERENITY_SOURCE_DIR}/sync-local.sh" ]; then
|
||||
sh "${SERENITY_SOURCE_DIR}/sync-local.sh"
|
||||
fi
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue