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.
This commit is contained in:
@@ -115,8 +115,6 @@ AddFilesToPackage apps : $(SYSTEM_APPS) ;
|
|||||||
AddFilesToPackage preferences : $(SYSTEM_PREFERENCES) ;
|
AddFilesToPackage preferences : $(SYSTEM_PREFERENCES) ;
|
||||||
AddFilesToPackage demos : $(SYSTEM_DEMOS) ;
|
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 ] ;
|
SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
|
||||||
AddFilesToPackage bin : install-wifi-firmwares.sh ;
|
AddFilesToPackage bin : install-wifi-firmwares.sh ;
|
||||||
|
|
||||||
|
|||||||
@@ -111,8 +111,6 @@ AddFilesToPackage apps : $(SYSTEM_APPS) ;
|
|||||||
AddFilesToPackage preferences : $(SYSTEM_PREFERENCES) ;
|
AddFilesToPackage preferences : $(SYSTEM_PREFERENCES) ;
|
||||||
AddFilesToPackage demos : $(SYSTEM_DEMOS) ;
|
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 ] ;
|
SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
|
||||||
AddFilesToPackage bin : install-wifi-firmwares.sh ;
|
AddFilesToPackage bin : install-wifi-firmwares.sh ;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
. /etc/profile > /dev/null 2>&1
|
|
||||||
|
|
||||||
whence $*
|
|
||||||
|
|
||||||
@@ -164,7 +164,6 @@ provides {
|
|||||||
cmd:watch
|
cmd:watch
|
||||||
cmd:wc
|
cmd:wc
|
||||||
cmd:wget = 1.12
|
cmd:wget = 1.12
|
||||||
cmd:which
|
|
||||||
cmd:whoami
|
cmd:whoami
|
||||||
cmd:xargs
|
cmd:xargs
|
||||||
cmd:xres
|
cmd:xres
|
||||||
|
|||||||
@@ -164,7 +164,6 @@ provides {
|
|||||||
cmd:watch
|
cmd:watch
|
||||||
cmd:wc
|
cmd:wc
|
||||||
cmd:wget = 1.12
|
cmd:wget = 1.12
|
||||||
cmd:which
|
|
||||||
cmd:whoami
|
cmd:whoami
|
||||||
cmd:xargs
|
cmd:xargs
|
||||||
cmd:xres
|
cmd:xres
|
||||||
|
|||||||
@@ -164,7 +164,6 @@ provides {
|
|||||||
cmd:watch
|
cmd:watch
|
||||||
cmd:wc
|
cmd:wc
|
||||||
cmd:wget = 1.12
|
cmd:wget = 1.12
|
||||||
cmd:which
|
|
||||||
cmd:whoami
|
cmd:whoami
|
||||||
cmd:xargs
|
cmd:xargs
|
||||||
cmd:xres
|
cmd:xres
|
||||||
|
|||||||
@@ -164,7 +164,6 @@ provides {
|
|||||||
cmd:watch
|
cmd:watch
|
||||||
cmd:wc
|
cmd:wc
|
||||||
cmd:wget = 1.12
|
cmd:wget = 1.12
|
||||||
cmd:which
|
|
||||||
cmd:whoami
|
cmd:whoami
|
||||||
cmd:xargs
|
cmd:xargs
|
||||||
cmd:xres
|
cmd:xres
|
||||||
|
|||||||
@@ -164,7 +164,6 @@ provides {
|
|||||||
cmd:watch
|
cmd:watch
|
||||||
cmd:wc
|
cmd:wc
|
||||||
cmd:wget = 1.12
|
cmd:wget = 1.12
|
||||||
cmd:which
|
|
||||||
cmd:whoami
|
cmd:whoami
|
||||||
cmd:xargs
|
cmd:xargs
|
||||||
cmd:xres
|
cmd:xres
|
||||||
|
|||||||
@@ -164,7 +164,6 @@ provides {
|
|||||||
cmd:watch
|
cmd:watch
|
||||||
cmd:wc
|
cmd:wc
|
||||||
cmd:wget = 1.12
|
cmd:wget = 1.12
|
||||||
cmd:which
|
|
||||||
cmd:whoami
|
cmd:whoami
|
||||||
cmd:xargs
|
cmd:xargs
|
||||||
cmd:xres
|
cmd:xres
|
||||||
|
|||||||
Reference in New Issue
Block a user