From dc54109d9847f6a498c89a1d8de96d3bed186c61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sun, 5 Apr 2009 09:14:21 +0000 Subject: [PATCH] Install bash as bash, and symlink sh to it, it's how it's done on other platforms and more logical. Btw those defines here are x86 only... FIXME git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29925 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 6 +++--- src/bin/bash/Jamfile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 9a05316069..d1153be5c6 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -18,7 +18,7 @@ if $(INCLUDE_GPL_ADDONS) = 1 { GPL_ONLY = "" ; } -SYSTEM_BIN = "[" addattr alert arp base64 basename bc beep bootman bzip2 +SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2 cal cat catattr checkfs chgrp chmod chop chown chroot cksum clear clockconfig cmp comm compress copyattr $(X86_ONLY)CortexAddOnHost cp csplit ctags cut date dc dd desklink df diff diff3 dircolors dirname @@ -38,7 +38,7 @@ SYSTEM_BIN = "[" addattr alert arp base64 basename bc beep bootman bzip2 printf profile ps ptx pwd query quit rc readlink release renice rescan rlog rm rmattr rmindex rmdir roster route safemode screen_blanker screenmode sed setdecor settype setversion setvolume - seq sh sha1sum shar shred shuf shutdown sleep sort spamdbm split stat strace + seq sha1sum shar shred shuf shutdown sleep sort spamdbm split stat strace stty su sum sync sysinfo tac tail tar tcpdump tcptester tee telnet telnetd test top touch tput tr traceroute translate true tsort tty @@ -238,7 +238,7 @@ AddFilesToHaikuImage system demos : $(SYSTEM_DEMOS) ; SEARCH on which = [ FDirName $(HAIKU_TOP) data bin ] ; AddFilesToHaikuImage system bin : which ; -AddSymlinkToHaikuImage system bin : sh : bash ; +AddSymlinkToHaikuImage system bin : bash : sh ; AddSymlinkToHaikuImage home Desktop : /boot/home : Home ; diff --git a/src/bin/bash/Jamfile b/src/bin/bash/Jamfile index 0d7cb22e70..a3b301cafc 100644 --- a/src/bin/bash/Jamfile +++ b/src/bin/bash/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin bash ; SetSubDirSupportedPlatformsBeOSCompatible ; -SubDirCcFlags -DHAVE_CONFIG_H -DPROGRAM='\"sh\"' -DCONF_HOSTTYPE='\"i586\"' -DCONF_OSTYPE='\"beos\"' -DCONF_MACHTYPE='\"i586-pc-beos\"' -DCONF_VENDOR='\"pc\"' -DSHELL ; +SubDirCcFlags -DHAVE_CONFIG_H -DPROGRAM='\"bash\"' -DCONF_HOSTTYPE='\"i586\"' -DCONF_OSTYPE='\"beos\"' -DCONF_MACHTYPE='\"i586-pc-beos\"' -DCONF_VENDOR='\"pc\"' -DSHELL ; # filter warnings we don't want here TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS) @@ -64,7 +64,7 @@ if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { jobControlSources = nojobs.c ; } -BinCommand sh : +BinCommand bash : parse.y shell.c eval.c general.c make_cmd.c print_cmd.c dispose_cmd.c execute_cmd.c variables.c version.c expr.c copy_cmd.c flags.c subst.c hashcmd.c hashlib.c mailcheck.c