RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 09:04:59 +00:00
Code Issues Activity Actions

Meta: Factorize path resolution

Browse source 
This patch adds the `find_executable()` function that will hopefully
find executables in a distro-agnostic way and that is (hopefully as
well) easily upgradable.

The function uses some bash functionalities. So, we now require bash
for each script that includes `.shell_include.sh`.
This commit is contained in:
Lucas CHOLLET 2022-12-06 18:17:41 +01:00 • committed by Linus Groh
parent b409d3cf88
commit 0fde7fe3c5
6 changed files with 35 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,17 +1,4 @@
#!/bin/sh
# Note: This is done before `set -e` to let `command` fail if needed
FUSE2FS_PATH=$(command -v fuse2fs)
RESIZE2FS_PATH=$(command -v resize2fs)
if [ -z "$FUSE2FS_PATH" ]; then
FUSE2FS_PATH=/usr/sbin/fuse2fs
fi
if [ -z "$RESIZE2FS_PATH" ]; then
RESIZE2FS_PATH=/usr/sbin/resize2fs
fi
#!/usr/bin/env bash
set -e
SCRIPT_DIR="$(dirname "${0}")"
@ -42,26 +29,6 @@ else
: "${SUDO_UID:=0}" "${SUDO_GID:=0}"
fi
if [ "$(uname -s)" = "Darwin" ]; then
export PATH="/usr/local/opt/e2fsprogs/bin:$PATH"
export PATH="/usr/local/opt/e2fsprogs/sbin:$PATH"
export PATH="/opt/homebrew/opt/e2fsprogs/bin:$PATH"
export PATH="/opt/homebrew/opt/e2fsprogs/sbin:$PATH"
E2FSCK="e2fsck"
RESIZE2FS_PATH="resize2fs"
elif [ ! -f "$E2FSCK" ]; then
E2FSCK="$(command -v e2fsck)"
if [ ! -f "$E2FSCK" ]; then
E2FSCK="/usr/sbin/e2fsck"
if [ ! -f "$E2FSCK" ]; then
E2FSCK="/sbin/e2fsck"
fi
fi
fi
# Prepend the toolchain qemu directory so we pick up QEMU from there
PATH="$SCRIPT_DIR/../Toolchain/Local/qemu/bin:$PATH"