ShellScriptlets.py: fix meson setup command

haikuports · Dec 20, 2024 · cd87dc3 · cd87dc3
1 parent efe357b
commit cd87dc3
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/HaikuPorter/ShellScriptlets.py b/HaikuPorter/ShellScriptlets.py
@@ -348,7 +348,8 @@ def getShellVariableSetters(shellVariables):
 # helper function to validate Meson invocations (and use the correct one)
 meson()
 {
-	if [[ "$*" != *buildtype* ]]; then
+	if [[ "$*" != *buildtype* ]] && [[ "$*" != compile* ]] \
+			&& [[ "$*" != install* ]] && [[ "$*" != test* ]]; then
 		echo "error: invoking meson without --buildtype argument"
 		echo "note: you probably want --buildtype=release or --buildtype=debugoptimized"
 		exit 1
@@ -365,7 +366,17 @@ def getShellVariableSetters(shellVariables):
 		MESON=$(type -Pp meson)
 	fi
 
-	$MESON --wrap-mode=nodownload "$@"
+	if [[ "$*" != compile* ]] && [[ "$*" != install* ]] \
+		&& [[ "$*" != test* ]]; then
+		local PATTERN='^setup (.*)'
+		if [[ "$*" =~ $PATTERN ]]; then
+			$MESON setup --wrap-mode=nodownload ${BASH_REMATCH[1]}
+		else
+			$MESON --wrap-mode=nodownload "$@"
+		fi
+	else
+		$MESON "$@"
+	fi
 }
 
 fixDevelopLibDirReferences()