LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-10 13:00:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Build: Remove hardcoded executable path

Browse Source 
Let which find the fuse2fs executable path for us, as it is not in
`/usr/sbin` in every distro.
This commit is contained in:
Lucas CHOLLET 2022-01-31 12:42:52 +01:00 committed by Andreas Kling
parent 13f92627b2
commit daec521010
Notes: sideshowbarker 2024-07-17 19:53:28 +09:00 
Author: https://github.com/LucasChollet
Commit: https://github.com/SerenityOS/serenity/commit/daec5210106
Pull-request: https://github.com/SerenityOS/serenity/pull/12227
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Meta/build-image-qemu.sh
View File

@ -1,5 +1,12 @@
#!/bin/sh
# Note: This is done before `set -e` to let `command` fail if needed
FUSE2FS_PATH=$(command -v fuse2fs)
if [ -z "$FUSE2FS_PATH" ]; then
FUSE2FS_PATH=/usr/sbin/fuse2fs
fi
set -e
die() {
@ -10,7 +17,7 @@ die() {
USE_FUSE2FS=0
if [ "$(id -u)" != 0 ]; then
if [ -x /usr/sbin/fuse2fs ] && /usr/sbin/fuse2fs --help 2>&1 |grep fakeroot > /dev/null; then
if [ -x "$FUSE2FS_PATH" ] && $FUSE2FS_PATH --help 2>&1 |grep fakeroot > /dev/null; then
USE_FUSE2FS=1
else
sudo -E -- "$0" "$@" || die "this script needs to run as root"
@ -123,7 +130,7 @@ printf "mounting filesystem... "
mkdir -p mnt
use_genext2fs=0
if [ $USE_FUSE2FS -eq 1 ]; then
mount_cmd="/usr/sbin/fuse2fs _disk_image mnt/ -o fakeroot,rw"
mount_cmd="$FUSE2FS_PATH _disk_image mnt/ -o fakeroot,rw"
elif [ "$(uname -s)" = "Darwin" ]; then
mount_cmd="fuse-ext2 _disk_image mnt -o rw+,allow_other,uid=501,gid=20"
elif [ "$(uname -s)" = "OpenBSD" ]; then