mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-08-17 09:20:28 +03:00
Meta: Start moving common shell definitions into a common file
This commit is contained in:
parent
9d6c4c5137
commit
2a4f81fc83
Notes:
sideshowbarker
2024-07-17 06:09:44 +09:00
Author: https://github.com/timschumi Commit: https://github.com/SerenityOS/serenity/commit/2a4f81fc83 Pull-request: https://github.com/SerenityOS/serenity/pull/15645 Reviewed-by: https://github.com/linusg ✅ Reviewed-by: https://github.com/nico
15
Meta/.shell_include.sh
Executable file
15
Meta/.shell_include.sh
Executable file
@ -0,0 +1,15 @@
|
||||
#!/bin/sh
|
||||
# shellcheck disable=SC2034
|
||||
# SC2034: "Variable appears unused. Verify it or export it."
|
||||
# Those are intentional here, as the file is meant to be included elsewhere.
|
||||
|
||||
SUDO="sudo"
|
||||
|
||||
if [ "$(uname -s)" = "SerenityOS" ]; then
|
||||
SUDO="pls"
|
||||
fi
|
||||
|
||||
die() {
|
||||
echo "die: $*"
|
||||
exit 1
|
||||
}
|
@ -2,16 +2,9 @@
|
||||
|
||||
set -e
|
||||
|
||||
SUDO="sudo"
|
||||
script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
|
||||
|
||||
if [ "$(uname -s)" = "SerenityOS" ]; then
|
||||
SUDO="pls"
|
||||
fi
|
||||
|
||||
die() {
|
||||
echo "die: $*"
|
||||
exit 1
|
||||
}
|
||||
. "${script_path}/.shell_include.sh"
|
||||
|
||||
if [ "$(id -u)" != 0 ]; then
|
||||
set +e
|
||||
@ -98,7 +91,6 @@ mkdir -p mnt
|
||||
mount "${dev}${partition_number}" mnt/ || die "couldn't mount filesystem"
|
||||
echo "done"
|
||||
|
||||
script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
|
||||
"$script_path/build-root-filesystem.sh"
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
|
@ -2,16 +2,9 @@
|
||||
|
||||
set -e
|
||||
|
||||
SUDO="sudo"
|
||||
script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
|
||||
|
||||
if [ "$(uname -s)" = "SerenityOS" ]; then
|
||||
SUDO="pls"
|
||||
fi
|
||||
|
||||
die() {
|
||||
echo "die: $*"
|
||||
exit 1
|
||||
}
|
||||
. "${script_path}/.shell_include.sh"
|
||||
|
||||
if [ "$(id -u)" != 0 ]; then
|
||||
set +e
|
||||
@ -116,7 +109,6 @@ mkdir -p mnt
|
||||
mount "${dev}${partition_number}" mnt/ || die "couldn't mount filesystem"
|
||||
echo "done"
|
||||
|
||||
script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
|
||||
"$script_path/build-root-filesystem.sh"
|
||||
|
||||
if [ -z "$2" ]; then
|
||||
|
@ -2,16 +2,9 @@
|
||||
|
||||
set -e
|
||||
|
||||
SUDO="sudo"
|
||||
script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
|
||||
|
||||
if [ "$(uname -s)" = "SerenityOS" ]; then
|
||||
SUDO="pls"
|
||||
fi
|
||||
|
||||
die() {
|
||||
echo "die: $*"
|
||||
exit 1
|
||||
}
|
||||
. "${script_path}/.shell_include.sh"
|
||||
|
||||
if [ ! -d "limine" ]; then
|
||||
echo "limine not found, the script will now build it"
|
||||
@ -102,7 +95,6 @@ mkdir -p mnt
|
||||
mount "${dev}p2" mnt || die "couldn't mount root filesystem"
|
||||
echo "done"
|
||||
|
||||
script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
|
||||
"$script_path/build-root-filesystem.sh"
|
||||
|
||||
echo "installing limine"
|
||||
|
@ -14,16 +14,9 @@ fi
|
||||
|
||||
set -e
|
||||
|
||||
SUDO="sudo"
|
||||
SCRIPT_DIR="$(dirname "${0}")"
|
||||
|
||||
if [ "$(uname -s)" = "SerenityOS" ]; then
|
||||
SUDO="pls"
|
||||
fi
|
||||
|
||||
die() {
|
||||
echo "die: $*"
|
||||
exit 1
|
||||
}
|
||||
. "${SCRIPT_DIR}/.shell_include.sh"
|
||||
|
||||
USE_FUSE2FS=0
|
||||
|
||||
@ -66,7 +59,6 @@ else
|
||||
fi
|
||||
fi
|
||||
|
||||
SCRIPT_DIR="$(dirname "${0}")"
|
||||
|
||||
# Prepend the toolchain qemu directory so we pick up QEMU from there
|
||||
PATH="$SCRIPT_DIR/../Toolchain/Local/qemu/bin:$PATH"
|
||||
|
@ -2,16 +2,9 @@
|
||||
|
||||
set -e
|
||||
|
||||
SUDO="sudo"
|
||||
script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
|
||||
|
||||
if [ "$(uname -s)" = "SerenityOS" ]; then
|
||||
SUDO="pls"
|
||||
fi
|
||||
|
||||
die() {
|
||||
echo "die: $*"
|
||||
exit 1
|
||||
}
|
||||
. "${script_path}/.shell_include.sh"
|
||||
|
||||
cleanup() {
|
||||
if [ -d mnt ]; then
|
||||
@ -60,5 +53,4 @@ else
|
||||
echo "done"
|
||||
fi
|
||||
|
||||
script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
|
||||
"$script_path/build-root-filesystem.sh"
|
||||
|
Loading…
Reference in New Issue
Block a user