From 37343ca1f6786a7e392de7485c82d967e0911be6 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Tue, 1 Oct 2013 16:26:05 +0200
Subject: [PATCH] Remove which command from default image

 * This was a script relying on a working /etc/profile, which may not be
there
 * Instead, use GNU which, available as an haikuport recipe
 * Since the command does not seem to be needed for Haiku to run (and
also because I don't know how to do it), GNU which isn't in the default
 install.
 * Typing "which" in a terminal still works, as that uses an alias
defined directly in /etc/profile.
---
 build/jam/packages/Haiku              | 2 --
 build/jam/packages/HaikuBootstrap     | 2 --
 data/bin/which                        | 6 ------
 src/data/package_infos/arm/haiku      | 1 -
 src/data/package_infos/m68k/haiku     | 1 -
 src/data/package_infos/ppc/haiku      | 1 -
 src/data/package_infos/x86/haiku      | 1 -
 src/data/package_infos/x86_64/haiku   | 1 -
 src/data/package_infos/x86_gcc2/haiku | 1 -
 9 files changed, 16 deletions(-)
 delete mode 100755 data/bin/which

diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index eced2f8116..fa75457e8e 100644
--- a/build/jam/packages/Haiku
+++ b/build/jam/packages/Haiku
@@ -115,8 +115,6 @@ AddFilesToPackage apps			: $(SYSTEM_APPS) ;
 AddFilesToPackage preferences	: $(SYSTEM_PREFERENCES) ;
 AddFilesToPackage demos			: $(SYSTEM_DEMOS) ;
 
-SEARCH on which = [ FDirName $(HAIKU_TOP) data bin ] ;
-AddFilesToPackage bin : which ;
 SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
 AddFilesToPackage bin : install-wifi-firmwares.sh ;
 
diff --git a/build/jam/packages/HaikuBootstrap b/build/jam/packages/HaikuBootstrap
index b6eedd8da5..491ebaeeb4 100644
--- a/build/jam/packages/HaikuBootstrap
+++ b/build/jam/packages/HaikuBootstrap
@@ -111,8 +111,6 @@ AddFilesToPackage apps			: $(SYSTEM_APPS) ;
 AddFilesToPackage preferences	: $(SYSTEM_PREFERENCES) ;
 AddFilesToPackage demos			: $(SYSTEM_DEMOS) ;
 
-SEARCH on which = [ FDirName $(HAIKU_TOP) data bin ] ;
-AddFilesToPackage bin : which ;
 SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
 AddFilesToPackage bin : install-wifi-firmwares.sh ;
 
diff --git a/data/bin/which b/data/bin/which
deleted file mode 100755
index e44b08557d..0000000000
--- a/data/bin/which
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-. /etc/profile > /dev/null 2>&1
-
-whence $*
-
diff --git a/src/data/package_infos/arm/haiku b/src/data/package_infos/arm/haiku
index b257057498..aad4fb5c30 100644
--- a/src/data/package_infos/arm/haiku
+++ b/src/data/package_infos/arm/haiku
@@ -164,7 +164,6 @@ provides {
 	cmd:watch
 	cmd:wc
 	cmd:wget = 1.12
-	cmd:which
 	cmd:whoami
 	cmd:xargs
 	cmd:xres
diff --git a/src/data/package_infos/m68k/haiku b/src/data/package_infos/m68k/haiku
index af37e22fe2..4b8e65f781 100644
--- a/src/data/package_infos/m68k/haiku
+++ b/src/data/package_infos/m68k/haiku
@@ -164,7 +164,6 @@ provides {
 	cmd:watch
 	cmd:wc
 	cmd:wget = 1.12
-	cmd:which
 	cmd:whoami
 	cmd:xargs
 	cmd:xres
diff --git a/src/data/package_infos/ppc/haiku b/src/data/package_infos/ppc/haiku
index 87e4d849c8..49919eee9b 100644
--- a/src/data/package_infos/ppc/haiku
+++ b/src/data/package_infos/ppc/haiku
@@ -164,7 +164,6 @@ provides {
 	cmd:watch
 	cmd:wc
 	cmd:wget = 1.12
-	cmd:which
 	cmd:whoami
 	cmd:xargs
 	cmd:xres
diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
index 422bc09561..757f46fb39 100644
--- a/src/data/package_infos/x86/haiku
+++ b/src/data/package_infos/x86/haiku
@@ -164,7 +164,6 @@ provides {
 	cmd:watch
 	cmd:wc
 	cmd:wget = 1.12
-	cmd:which
 	cmd:whoami
 	cmd:xargs
 	cmd:xres
diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku
index 7383f7d06f..7099714349 100644
--- a/src/data/package_infos/x86_64/haiku
+++ b/src/data/package_infos/x86_64/haiku
@@ -164,7 +164,6 @@ provides {
 	cmd:watch
 	cmd:wc
 	cmd:wget = 1.12
-	cmd:which
 	cmd:whoami
 	cmd:xargs
 	cmd:xres
diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku
index eb0b5a4309..1a433e5f77 100644
--- a/src/data/package_infos/x86_gcc2/haiku
+++ b/src/data/package_infos/x86_gcc2/haiku
@@ -164,7 +164,6 @@ provides {
 	cmd:watch
 	cmd:wc
 	cmd:wget = 1.12
-	cmd:which
 	cmd:whoami
 	cmd:xargs
 	cmd:xres