kill lash. "lash" builtin still exists, but it runs hush.

4 files changed, 15 insertions, 13 deletions

diff --git a/shell/Config.in b/shell/Config.in
index 312583e87..9328c9102 100644
--- a/shell/Config.in
+++ b/shell/Config.in
@@ -20,9 +20,9 @@ config FEATURE_SH_IS_HUSH
         select HUSH
         bool "hush"
 
-config FEATURE_SH_IS_LASH
-        select LASH
-        bool "lash"
+####config FEATURE_SH_IS_LASH
+####    select LASH
+####    bool "lash"
 
 config FEATURE_SH_IS_MSH
         select MSH
@@ -229,16 +229,9 @@ config HUSH_LOOPS
 config LASH
         bool "lash"
         default n
-        select TRUE
-        select FALSE
-        select TEST
+        select HUSH
         help
-          lash is the very smallest shell (adds just 10k) and it is quite
-          usable as a command prompt, but it is not suitable for any but the
-          most trivial scripting (such as an initrd that calls insmod a few
-          times) since it does not understand any Bourne shell grammar.  It
-          does handle pipes, redirects, and job control though.  Adding in
-          command editing makes it a very nice lightweight command prompt.
+          lash is deprecated and will be removed, please migrate to hush.
 
 
 config MSH
diff --git a/shell/Kbuild b/shell/Kbuild
index 944eaff51..36a8ffd3a 100644
--- a/shell/Kbuild
+++ b/shell/Kbuild
@@ -7,7 +7,6 @@
 lib-y:=
 lib-$(CONFIG_ASH)  += ash.o
 lib-$(CONFIG_HUSH) += hush.o
-lib-$(CONFIG_LASH) += lash.o
 lib-$(CONFIG_MSH)  += msh.o
 
 lib-$(CONFIG_CTTYHACK) += cttyhack.o
diff --git a/shell/hush.c b/shell/hush.c
index 6bf4d1d19..b3c77aa14 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -3925,3 +3925,13 @@ int hush_main(int argc, char **argv)
 #endif
         hush_exit(opt ? opt : last_return_code);
 }
+
+
+#if ENABLE_LASH
+int lash_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int lash_main(int argc, char **argv)
+{
+        //bb_error_msg("lash is deprecated, please use hush instead");
+        return hush_main(argc, argv);
+}
+#endif
diff --git a/shell/lash.c b/shell/lash_unused.c
index 781dfdb5a..781dfdb5a 100644
--- a/shell/lash.c
+++ b/shell/lash_unused.c