summaryrefslogtreecommitdiff
path: root/Meta/build-image-grub.sh
diff options
context:
space:
mode:
authorTim Schumacher <timschumi@gmx.de>2022-10-16 21:46:42 +0200
committerLinus Groh <mail@linusgroh.de>2022-10-16 23:39:45 +0200
commit2a4f81fc8374354e9109333894eef0ca4f1046de (patch)
tree5223ef140b3029155c891cb7747a8642b60ba50c /Meta/build-image-grub.sh
parent9d6c4c51379b2561ebc72db9ba32576004604275 (diff)
downloadserenity-2a4f81fc8374354e9109333894eef0ca4f1046de.zip
Meta: Start moving common shell definitions into a common file
Diffstat (limited to 'Meta/build-image-grub.sh')
-rwxr-xr-xMeta/build-image-grub.sh12
1 files changed, 2 insertions, 10 deletions
diff --git a/Meta/build-image-grub.sh b/Meta/build-image-grub.sh
index 4bb95b7667..c0720e335a 100755
--- a/Meta/build-image-grub.sh
+++ b/Meta/build-image-grub.sh
@@ -2,16 +2,9 @@
set -e
-SUDO="sudo"
-
-if [ "$(uname -s)" = "SerenityOS" ]; then
- SUDO="pls"
-fi
+script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
-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