svn commit: [25789] trunk/busybox/shell

vapier at busybox.net vapier at busybox.net
Mon Mar 23 08:44:02 UTC 2009


Author: vapier
Date: 2009-03-23 08:44:02 +0000 (Mon, 23 Mar 2009)
New Revision: 25789

Log:
do not make startup banner depend on job support

Modified:
   trunk/busybox/shell/hush.c


Changeset:
Modified: trunk/busybox/shell/hush.c
===================================================================
--- trunk/busybox/shell/hush.c	2009-03-23 06:33:37 UTC (rev 25788)
+++ trunk/busybox/shell/hush.c	2009-03-23 08:44:02 UTC (rev 25789)
@@ -4313,10 +4313,6 @@
 			/* xfunc has failed! die die die */
 			hush_exit(xfunc_error_retval);
 		}
-#if !ENABLE_FEATURE_SH_EXTRA_QUIET
-		printf("\n\n%s hush - the humble shell v"HUSH_VER_STR"\n", bb_banner);
-		printf("Enter 'help' for a list of built-in commands.\n\n");
-#endif
 	}
 #elif ENABLE_HUSH_INTERACTIVE
 /* no job control compiled, only prompt/line editing */
@@ -4338,6 +4334,11 @@
 	}
 #endif
 
+	if (!ENABLE_FEATURE_SH_EXTRA_QUIET && G.interactive_fd) {
+		printf("\n\n%s hush - the humble shell v"HUSH_VER_STR"\n", bb_banner);
+		printf("Enter 'help' for a list of built-in commands.\n\n");
+	}
+
 	if (argv[optind] == NULL) {
 		opt = parse_and_run_file(stdin);
 	} else {



More information about the busybox-cvs mailing list