[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2629-g139ce8b

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  139ce8b19d000d13748505bdf55e370bedb9058f (commit)
       via  442d2ad1c0a85a3e3a05a30aed8a28ef03c92984 (commit)
      from  6490053baa376252bafb805611c182d8c719f3f0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 139ce8b19d000d13748505bdf55e370bedb9058f
Merge: 442d2ad 6490053
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Dec 8 19:42:12 2011 +0100

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 442d2ad1c0a85a3e3a05a30aed8a28ef03c92984
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Dec 8 19:40:00 2011 +0100

    [BUILD] Remove annoying message asking to check for /bin/sh is pointing to /bin/bash by moving detection in scripts/. Message is now only displayed if the link is not correct.

-----------------------------------------------------------------------

Summary of changes:
 Makefile              |    3 +--
 scripts/check_bash.sh |   11 +++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100755 scripts/check_bash.sh

diff --git a/Makefile b/Makefile
index 4b1bd23..db47cc3 100644
--- a/Makefile
+++ b/Makefile
@@ -159,8 +159,7 @@ endif
 	fi;
 
 all: $(BUILDROOT_DIR)/.configured
-	@echo "If your /bin/sh link doesn't point to /bin/bash, please correct that."
-	@ls -al /bin/sh | grep bash
+	@./scripts/check_bash.sh
 	@echo -n `date +%s` > before.txt
 	@$(MAKE) -C $(BUILDROOT_DIR) $@
 	@./scripts/show_build_infos.sh
diff --git a/scripts/check_bash.sh b/scripts/check_bash.sh
new file mode 100755
index 0000000..35545bc
--- /dev/null
+++ b/scripts/check_bash.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ -L /bin/sh ]; then
+	SH_IS_BASH=`ls -al /bin/sh | grep bash`
+	if [ "$SH_IS_BASH" == "" ]; then
+		echo "On your system /bin/sh is a symbolic link that doesn't point to /bin/bash --> please correct that !"
+		ls -al /bin/sh
+		exit 1
+	fi
+fi
+exit 0


hooks/post-receive
-- 
armadeus