34 lines
1.0 KiB
Plaintext
34 lines
1.0 KiB
Plaintext
From 8d785ea26c4dda7b1165be3ffb8346c91def6fdc Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Przemys=C5=82aw=20S=C5=82aby?= <przemub@przemub.pl>
|
|
Date: Mon, 18 May 2020 18:08:03 +0100
|
|
Subject: [PATCH] Disable ps processing due to Haiku's team/thread model
|
|
|
|
---
|
|
src/parallel | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/parallel b/src/parallel
|
|
index 03a3549..8ddd1ef 100755
|
|
--- a/src/parallel
|
|
+++ b/src/parallel
|
|
@@ -1732,7 +1732,7 @@ sub parse_options(@) {
|
|
if($opt::bug) { ::die_bug("test-bug"); }
|
|
$Global::debug = $opt::D;
|
|
$Global::shell = $ENV{'PARALLEL_SHELL'} || parent_shell($$)
|
|
- || $ENV{'SHELL'} || "/bin/sh";
|
|
+ || $ENV{'SHELL'} || "/bin/bash";
|
|
if(not -x $Global::shell and not which($Global::shell)) {
|
|
::error("Shell '$Global::shell' not found.");
|
|
wait_and_exit(255);
|
|
@@ -5746,6 +5746,7 @@ sub which(@) {
|
|
'dragonfly' => $bsd,
|
|
'freebsd' => $bsd,
|
|
'gnu' => $sysv,
|
|
+ 'haiku' => "echo ps not supported",
|
|
'hpux' => $sysv,
|
|
'linux' => $sysv,
|
|
'mirbsd' => $bsd,
|
|
--
|
|
2.26.0
|
|
|