system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-21 10:05:32 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Meta: get rid of sync.sh using the technique used in the previous commit

Browse source
This commit is contained in:
Emanuele Torre 2020-06-20 03:01:02 +02:00 committed by Andreas Kling
parent e42f4abd61
commit 4a784d4d1b
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -13,7 +13,7 @@ set(CMAKE_INSTALL_MESSAGE NEVER)
enable_testing()
add_custom_target(image
COMMAND ${CMAKE_COMMAND} -E env "SERENITY_ROOT=${CMAKE_SOURCE_DIR}" ${CMAKE_SOURCE_DIR}/Meta/sync.sh
COMMAND ${CMAKE_COMMAND} -E env "SERENITY_ROOT=${CMAKE_SOURCE_DIR}" ${CMAKE_SOURCE_DIR}/Meta/build-image-qemu.sh
BYPRODUCTS ${CMAKE_BINARY_DIR}/_disk_image
USES_TERMINAL
)

3
Meta/build-image-qemu.sh
View file

@ -8,8 +8,9 @@ die() {
}
if [ "$(id -u)" != 0 ]; then
die "this script needs to run as root"
exec sudo -E -- "$0" "$@" || die "this script needs to run as root"
fi
if [ "$(uname -s)" = "Darwin" ]; then
export PATH="/usr/local/opt/e2fsprogs/bin:$PATH"
export PATH="/usr/local/opt/e2fsprogs/sbin:$PATH"

6
Meta/sync.sh
View file

@ -1,6 +0,0 @@
#!/bin/sh
set -e
script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
sudo -E PATH="$PATH" "$script_path/build-image-qemu.sh"