From 7086358f5720019ba367ea73d035c60241bceb1a Mon Sep 17 00:00:00 2001 From: NicJA Date: Sat, 15 Apr 2017 03:34:37 +0000 Subject: [PATCH] launch sh via the normal shell. copy an appropriate startup script to s: git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@54527 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- gnu/abc-shell/mmakefile.src | 6 +++--- gnu/abc-shell/s/DevShell-Startup | 1 + gnu/abc-shell/s/mmakefile.src | 14 ++++++++++++++ .../Gorilla/Icons/Medium/AROS/Developer/DevEnv.info.src | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 gnu/abc-shell/s/DevShell-Startup create mode 100644 gnu/abc-shell/s/mmakefile.src diff --git a/gnu/abc-shell/mmakefile.src b/gnu/abc-shell/mmakefile.src index 7eee7a8ef..ac1a24fd9 100644 --- a/gnu/abc-shell/mmakefile.src +++ b/gnu/abc-shell/mmakefile.src @@ -1,4 +1,4 @@ -# Copyright © 2008, The AROS Development Team. All rights reserved. +# Copyright © 2008-2017, The AROS Development Team. All rights reserved. # $Id$ include $(SRCDIR)/config/aros-contrib.cfg @@ -11,8 +11,8 @@ NOWARN_FLAGS := $(NOWARN_FORMAT_SECURITY) USER_CFLAGS := $(NOWARN_FLAGS) -DAMIGA -DPOSIXLY_CORRECT -DHISTORY -DAUTOINIT -D__USE_RUNCOMMAND__ -DUSE_TEMPFILES USER_LDFLAGS := -nix -#MM- contrib-gnu : contrib-gnu-sh -#MM- contrib-gnu-sh : sh +#MM- contrib-gnu : contrib-gnu-abcshell +#MM- contrib-gnu-abcshell : contrib-gnu-sh %build_prog mmake=contrib-gnu-sh progname=sh files=$(FILES) targetdir=$(DESTDIR) diff --git a/gnu/abc-shell/s/DevShell-Startup b/gnu/abc-shell/s/DevShell-Startup new file mode 100644 index 000000000..b505b9e96 --- /dev/null +++ b/gnu/abc-shell/s/DevShell-Startup @@ -0,0 +1 @@ +Developer:bin/sh diff --git a/gnu/abc-shell/s/mmakefile.src b/gnu/abc-shell/s/mmakefile.src new file mode 100644 index 000000000..155c152f0 --- /dev/null +++ b/gnu/abc-shell/s/mmakefile.src @@ -0,0 +1,14 @@ +# Copyright © 2008-2017, The AROS Development Team. All rights reserved. +# $Id$ + +include $(SRCDIR)/config/aros-contrib.cfg + +#MM- contrib-gnu-abcshell : contrib-developer-shell + +$(AROS_S)/DevShell-Startup : DevShell-Startup + @$(CP) $^ $@ + +#MM +contrib-developer-shell : $(AROS_S)/DevShell-Startup + +%common diff --git a/images/IconSets/Gorilla/Icons/Medium/AROS/Developer/DevEnv.info.src b/images/IconSets/Gorilla/Icons/Medium/AROS/Developer/DevEnv.info.src index 593a199b1..2435b6d3c 100644 --- a/images/IconSets/Gorilla/Icons/Medium/AROS/Developer/DevEnv.info.src +++ b/images/IconSets/Gorilla/Icons/Medium/AROS/Developer/DevEnv.info.src @@ -1,4 +1,4 @@ TYPE = PROJECT -DEFAULTTOOL = "Developer:bin/sh" +DEFAULTTOOL = "SYS:System/CLI" TOOLTYPE = "WINDOW=CON:0/50//130/Developer Shell/CLOSE" TOOLTYPE = "FROM=S:DevShell-Startup" -- 2.11.4.GIT