Prefer real executables when available (#1296)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7232 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/files/etc/profile b/package/base-files/files/etc/profile
index 8aac3b752779ecd3df5bf87f82220cc21731ebe1..5cb83c9355fbcf4f1e85c10b4ce42d69642b5cae 100644 (file)
--- a/package/base-files/files/etc/profile
+++ b/package/base-files/files/etc/profile
@@ -5,10 +5,10 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 export HOME=/tmp
 export PS1='\u@\h:\w\$ '
 
-alias more=less
-[ -x /usr/bin/vim ] || alias vim=vi
+[ -x /bin/more ] || alias more=less
+[ -x /usr/bin/vim ] && alias vi=vim || alias vim=vi
 
 [ -z "$KSH_VERSION" -o \! -s /etc/mkshrc ] || . /etc/mkshrc
 
-arp() { cat /proc/net/arp; }
+[ -x /sbin/arp ] || arp() { cat /proc/net/arp; }
 [ -z /bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }