ShellScriptlets: Fix meson setup command

Put --wrap-mode=nodownload at the end of the arguments list, to avoid conflicting with the meson setup command. To allow recipes to override, only use it when wrap-mode isn't in the arguments. Fixes haikuports#249.
robxnano · Mar 25, 2023 · 616f713 · 616f713
1 parent adc25c2
commit 616f713
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/HaikuPorter/ShellScriptlets.py b/HaikuPorter/ShellScriptlets.py
@@ -351,7 +351,11 @@ def getShellVariableSetters(shellVariables):
 		MESON=$(which meson)
 	fi
 
-	$MESON --wrap-mode=nodownload "$@"
+	if [[ "$1" == setup && "$*" != *wrap-mode* ]]; then
+		$MESON "$@" --wrap-mode=nodownload
+	else
+		$MESON "$@"
+	fi
 }
 
 fixDevelopLibDirReferences()