Don't hardcode /bin/bash in order to be more Prefix-friendly.

svn path=/trunk/; revision=552

15 files changed, 32 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index dfcf575..9b5690b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2009-05-19  Ulrich Mueller  <ulm@gentoo.org>
 
+	* bin/eselect.in: Don't hardcode /bin/bash; use configured path
+	instead, as requested by Fabian Groffen	<grobian@gentoo.org>.
+	* bin/Makefile.am (dosed): Also substitute BASH. Use at signs
+	throughout, instead of percent signs.
+	* libs/config.bash.in, libs/core.bash.in, libs/default.eselect.in:
+	* libs/editor-variable.bash.in, libs/manip.bash.in:
+	* libs/multilib.bash.in, libs/output.bash.in:
+	* libs/package-manager.bash.in, libs/path-manipulation.bash.in:
+	* libs/tests.bash.in: Remove unnecessary shebang lines.
+	* libs/Makefile.am (eselectlibs_DATA): Don't set executable bit
+	for installed libs; therefore rename eselectlibs_SCRIPTS.
+	(CLEANFILES): Update accordingly.
+
 	* configure.ac: Update version to 1.1_rc2.
 	* Tagged 1.1_rc2 release candidate.
 
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 127f207..dbcafd8 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,8 +1,9 @@
 bin_SCRIPTS = eselect
 EXTRA_DIST = eselect.in
 
-dosed = @SED@ -e 's,%DATADIR%,$(datadir),g' \
-	      -e 's,%VERSION%,$(VERSION),g'
+dosed = @SED@ -e 's,\@BASH\@,$(BASH),g' \
+	      -e 's,\@DATADIR\@,$(datadir),g' \
+	      -e 's,\@VERSION\@,$(VERSION),g'
 
 % : %.in
 	@echo "Building $@..."
diff --git a/bin/eselect.in b/bin/eselect.in
index ffe6966..f6b47e1 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!@BASH@
 # Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
 # $Id$
 # This file is part of the 'eselect' tools framework.
@@ -16,7 +16,7 @@
 # eselect.  If not, see <http://www.gnu.org/licenses/>.
 
 # Where are our data?
-ESELECT_DATA_PATH="%DATADIR%/eselect"
+ESELECT_DATA_PATH="@DATADIR@/eselect"
 
 # Where are modules installed by default?
 ESELECT_DEFAULT_MODULES_PATH="${ESELECT_DATA_PATH}/modules"
@@ -33,7 +33,7 @@ ESELECT_CORE_PATH="${ESELECT_DATA_PATH}/libs"
 ESELECT_DEFAULT_ACTIONS="${ESELECT_CORE_PATH}/default.eselect"
 
 # Our program name and version
-ESELECT_VERSION="%VERSION%"
+ESELECT_VERSION="@VERSION@"
 ESELECT_PROGRAM_NAME="eselect"
 
 # Invocation information
diff --git a/libs/Makefile.am b/libs/Makefile.am
index e4e2d95..e53a7b8 100644
--- a/libs/Makefile.am
+++ b/libs/Makefile.am
@@ -1,17 +1,17 @@
 eselectlibsdir = $(datadir)/$(PACKAGE_NAME)/libs/
 
-eselectlibs_SCRIPTS = \
-		      config.bash \
-		      core.bash \
-		      default.eselect \
-		      editor-variable.bash \
-		      manip.bash \
-		      multilib.bash \
-		      output.bash \
-		      package-manager.bash \
-		      path-manipulation.bash \
-		      skel.bash \
-		      tests.bash
+eselectlibs_DATA = \
+		   config.bash \
+		   core.bash \
+		   default.eselect \
+		   editor-variable.bash \
+		   manip.bash \
+		   multilib.bash \
+		   output.bash \
+		   package-manager.bash \
+		   path-manipulation.bash \
+		   skel.bash \
+		   tests.bash
 
 EXTRA_DIST = \
 	     config.bash.in \
@@ -42,4 +42,4 @@ dosed = @SED@ \
 	cp $? $@
 
 MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = $(eselectlibs_SCRIPTS)
+CLEANFILES = $(eselectlibs_DATA)
diff --git a/libs/config.bash.in b/libs/config.bash.in
index fc7e1cf..3902ab0 100644
--- a/libs/config.bash.in
+++ b/libs/config.bash.in
@@ -1,4 +1,3 @@
-#!/bin/bash
 # Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
 # $Id$
 # This file is part of the 'eselect' tools framework.
diff --git a/libs/core.bash.in b/libs/core.bash.in
index a55ce69..d5ccfb8 100644
--- a/libs/core.bash.in
+++ b/libs/core.bash.in
@@ -1,4 +1,3 @@
-#!/bin/bash
 # Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
 # $Id$
 # This file is part of the 'eselect' tools framework.
diff --git a/libs/default.eselect.in b/libs/default.eselect.in
index ed19f81..56fac10 100644
--- a/libs/default.eselect.in
+++ b/libs/default.eselect.in
@@ -1,4 +1,3 @@
-#!/bin/bash
 # Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
 # $Id$
 # This file is part of the 'eselect' tools framework.
diff --git a/libs/editor-variable.bash.in b/libs/editor-variable.bash.in
index f57659d..e5fca29 100644
--- a/libs/editor-variable.bash.in
+++ b/libs/editor-variable.bash.in
@@ -1,4 +1,3 @@
-#!/bin/bash
 # Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
 # $Id$
 # This file is part of the 'eselect' tools framework.
diff --git a/libs/manip.bash.in b/libs/manip.bash.in
index 522f4c4..f6cdac0 100644
--- a/libs/manip.bash.in
+++ b/libs/manip.bash.in
@@ -1,4 +1,3 @@
-#!/bin/bash
 # Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
 # $Id$
 # This file is part of the 'eselect' tools framework.
diff --git a/libs/multilib.bash.in b/libs/multilib.bash.in
index 9871602..f40e304 100644
--- a/libs/multilib.bash.in
+++ b/libs/multilib.bash.in
@@ -1,4 +1,3 @@
-#!/bin/bash
 # Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
 # $Id$
 # This file is part of the 'eselect' tools framework.
diff --git a/libs/output.bash.in b/libs/output.bash.in
index 27a357f..53a806f 100644
--- a/libs/output.bash.in
+++ b/libs/output.bash.in
@@ -1,4 +1,3 @@
-#!/bin/bash
 # Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
 # $Id$
 # This file is part of the 'eselect' tools framework.
diff --git a/libs/package-manager.bash.in b/libs/package-manager.bash.in
index 80e8ef3..9fddf02 100644
--- a/libs/package-manager.bash.in
+++ b/libs/package-manager.bash.in
@@ -1,4 +1,3 @@
-#!/bin/bash
 # Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
 # $Id$
 # This file is part of the 'eselect' tools framework.
diff --git a/libs/path-manipulation.bash.in b/libs/path-manipulation.bash.in
index 84f57e2..b400a98 100644
--- a/libs/path-manipulation.bash.in
+++ b/libs/path-manipulation.bash.in
@@ -1,4 +1,3 @@
-#!/bin/bash
 # Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
 # $Id$
 # This file is part of the 'eselect' tools framework.
diff --git a/libs/skel.bash.in b/libs/skel.bash.in
index 24f44b6..bc7e697 100644
--- a/libs/skel.bash.in
+++ b/libs/skel.bash.in
@@ -1,4 +1,3 @@
-#!/bin/bash
 # Copyright (c) 1999-2009 Gentoo Foundation                 -*-eselect-*-
 # $Id$
 # This file is part of the 'eselect' tools framework.
diff --git a/libs/tests.bash.in b/libs/tests.bash.in
index 4d32e52..c0e3ae3 100644
--- a/libs/tests.bash.in
+++ b/libs/tests.bash.in
@@ -1,4 +1,3 @@
-#!/bin/bash
 # Copyright (c) 2005-2009 Gentoo Foundation                 -*-eselect-*-
 # $Id$
 # This file is part of the 'eselect' tools framework.