[openwrt/openwrt] base-files: fix alias more to properly detect /usr/bin/more

LEDE Commits lede-commits at lists.infradead.org
Sat Nov 28 20:12:50 EST 2020


aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/451c1eb8c2a87bbf486f2883518bbb8c1c06848f

commit 451c1eb8c2a87bbf486f2883518bbb8c1c06848f
Author: Huangbin Zhan <zhanhb88 at gmail.com>
AuthorDate: Fri Nov 27 19:02:47 2020 +0800

    base-files: fix alias more to properly detect /usr/bin/more
    
    Package more is installed to /usr/bin rather than /bin.
    
    Signed-off-by: Huangbin Zhan <zhanhb88 at gmail.com>
---
 package/base-files/files/etc/shinit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/base-files/files/etc/shinit b/package/base-files/files/etc/shinit
index 6b715c1ef9..dccba34b69 100644
--- a/package/base-files/files/etc/shinit
+++ b/package/base-files/files/etc/shinit
@@ -1,4 +1,4 @@
-[ -x /bin/more ] || alias more=less
+[ -x /bin/more ] || [ -x /usr/bin/more ] || alias more=less
 [ -x /usr/bin/vim ] && alias vi=vim || alias vim=vi
 
 alias ll='ls -alF --color=auto'



More information about the lede-commits mailing list