aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-05-18 22:09:18 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-05-18 22:09:18 +0000
commitc2fa2e48ea6c1b88689853d0e2ac48a4af53d316 (patch)
tree5be2456cb7dd1e6d1d4a02c2086ae6042a0222f5
parent6dfdd147bc1d25802ca5283abb23a09cf8bfa827 (diff)
downloadpaludis-c2fa2e48ea6c1b88689853d0e2ac48a4af53d316.tar.gz
paludis-c2fa2e48ea6c1b88689853d0e2ac48a4af53d316.tar.xz
Use bash rather than sh, since we already require it and BSD sh sucks
-rw-r--r--ebuild/Makefile.am2
-rw-r--r--ebuild/digests/Makefile.am2
-rw-r--r--ebuild/utils/Makefile.am2
-rwxr-xr-xebuild/utils/merge_TEST_cleanup.sh2
-rwxr-xr-xebuild/utils/merge_TEST_setup.sh2
-rwxr-xr-xebuild/utils/unmerge_TEST_cleanup.sh2
-rwxr-xr-xebuild/utils/unmerge_TEST_setup.sh2
-rw-r--r--hooks/Makefile.am.m42
-rw-r--r--paludis/Makefile.am.m42
-rw-r--r--paludis/args/Makefile.am2
-rwxr-xr-xpaludis/config_file_TEST_cleanup.sh2
-rwxr-xr-xpaludis/config_file_TEST_setup.sh2
-rwxr-xr-xpaludis/portage_repository_TEST_cleanup.sh2
-rwxr-xr-xpaludis/portage_repository_TEST_setup.sh2
-rw-r--r--paludis/qa/Makefile.am.m42
-rwxr-xr-xpaludis/qa/file_permissions_check_TEST_cleanup.sh2
-rwxr-xr-xpaludis/qa/file_permissions_check_TEST_setup.sh2
-rwxr-xr-xpaludis/qa/has_ebuilds_check_TEST_cleanup.sh2
-rwxr-xr-xpaludis/qa/has_ebuilds_check_TEST_setup.sh2
-rwxr-xr-xpaludis/qa/has_misc_files_check_TEST_cleanup.sh2
-rwxr-xr-xpaludis/qa/has_misc_files_check_TEST_setup.sh2
-rwxr-xr-xpaludis/qa/package_name_check_TEST_cleanup.sh2
-rwxr-xr-xpaludis/qa/package_name_check_TEST_setup.sh2
-rw-r--r--paludis/util/Makefile.am.m42
-rwxr-xr-xpaludis/util/dir_iterator_TEST_cleanup.sh2
-rwxr-xr-xpaludis/util/dir_iterator_TEST_setup.sh2
-rwxr-xr-xpaludis/util/fs_entry_TEST_cleanup.sh2
-rwxr-xr-xpaludis/util/fs_entry_TEST_setup.sh2
-rwxr-xr-xpaludis/util/is_file_with_extension_TEST_cleanup.sh2
-rwxr-xr-xpaludis/util/is_file_with_extension_TEST_setup.sh2
-rwxr-xr-xpaludis/vdb_repository_TEST_cleanup.sh2
-rwxr-xr-xpaludis/vdb_repository_TEST_setup.sh2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/qualudis/Makefile.am2
-rw-r--r--test/Makefile.am2
-rwxr-xr-xtest/run_test.sh2
36 files changed, 36 insertions, 36 deletions
diff --git a/ebuild/Makefile.am b/ebuild/Makefile.am
index 95b0e46..25e7ce5 100644
--- a/ebuild/Makefile.am
+++ b/ebuild/Makefile.am
@@ -38,7 +38,7 @@ libexecprog_SCRIPTS = \
TESTS_ENVIRONMENT = env \
PALUDIS_EBUILD_DIR="$(srcdir)/ebuild/" \
TEST_SCRIPT_DIR="$(srcdir)/" \
- $(SHELL) $(top_srcdir)/ebuild/run_test.bash
+ bash $(top_srcdir)/ebuild/run_test.bash
TESTS = echo_functions_TEST.bash list_functions_TEST.bash
EXTRA_DIST = $(libexecprog_SCRIPTS) run_test.bash $(TESTS)
diff --git a/ebuild/digests/Makefile.am b/ebuild/digests/Makefile.am
index e83ccea..46455f8 100644
--- a/ebuild/digests/Makefile.am
+++ b/ebuild/digests/Makefile.am
@@ -24,7 +24,7 @@ dormd160_SOURCES = \
TESTS_ENVIRONMENT = env \
PALUDIS_EBUILD_DIR="$(srcdir)/ebuild/" \
TEST_SCRIPT_DIR="$(srcdir)/" \
- $(SHELL) $(top_srcdir)/test/run_test.sh
+ bash $(top_srcdir)/test/run_test.sh
TESTS = dosha256_TEST dormd160_TEST
EXTRA_DIST = $(libexecprog_SCRIPTS) dosha256_TEST.cc dormd160_TEST.cc
diff --git a/ebuild/utils/Makefile.am b/ebuild/utils/Makefile.am
index e54997f..d9fae96 100644
--- a/ebuild/utils/Makefile.am
+++ b/ebuild/utils/Makefile.am
@@ -44,7 +44,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_EBUILD_DIR="$(top_srcdir)/ebuild/" \
PALUDIS_EBUILD_LOG_LEVEL="silent" \
TEST_SCRIPT_DIR="$(srcdir)/" \
- $(SHELL) $(top_srcdir)/ebuild/utils/run_test.bash
+ bash $(top_srcdir)/ebuild/utils/run_test.bash
TESTS = merge_TEST.bash dobin_TEST.bash unmerge_TEST.bash
check_SCRIPTS = $(TESTS) \
diff --git a/ebuild/utils/merge_TEST_cleanup.sh b/ebuild/utils/merge_TEST_cleanup.sh
index 2fe5c7a..4b40b8f 100755
--- a/ebuild/utils/merge_TEST_cleanup.sh
+++ b/ebuild/utils/merge_TEST_cleanup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
if [ -d merge_TEST_dir ] ; then
diff --git a/ebuild/utils/merge_TEST_setup.sh b/ebuild/utils/merge_TEST_setup.sh
index 7d71150..33b23e7 100755
--- a/ebuild/utils/merge_TEST_setup.sh
+++ b/ebuild/utils/merge_TEST_setup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
mkdir -p merge_TEST_dir/{empty_src,empty_dst} || exit 2
diff --git a/ebuild/utils/unmerge_TEST_cleanup.sh b/ebuild/utils/unmerge_TEST_cleanup.sh
index 1af2ac4..e0f01b6 100755
--- a/ebuild/utils/unmerge_TEST_cleanup.sh
+++ b/ebuild/utils/unmerge_TEST_cleanup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
if [ -d unmerge_TEST_dir ] ; then
diff --git a/ebuild/utils/unmerge_TEST_setup.sh b/ebuild/utils/unmerge_TEST_setup.sh
index 8cbfd3a..158e2ae 100755
--- a/ebuild/utils/unmerge_TEST_setup.sh
+++ b/ebuild/utils/unmerge_TEST_setup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
mkdir -p unmerge_TEST_dir/{empty_src,empty_dst} || exit 2
diff --git a/hooks/Makefile.am.m4 b/hooks/Makefile.am.m4
index e23639f..56314b3 100644
--- a/hooks/Makefile.am.m4
+++ b/hooks/Makefile.am.m4
@@ -27,7 +27,7 @@ installvarlibpaludisnews_SCRIPTS = \
TESTS_ENVIRONMENT = env \
PALUDIS_EBUILD_DIR="$(srcdir)/ebuild/" \
TEST_SCRIPT_DIR="$(srcdir)/" \
- $(SHELL) $(top_srcdir)/ebuild/run_test.bash
+ bash $(top_srcdir)/ebuild/run_test.bash
TESTS =
EXTRA_DIST = \
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index 8492060..8eeebb9 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -51,7 +51,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_EBUILD_DIR="$(top_srcdir)/ebuild/" \
PALUDIS_SKIP_CONFIG="yes" \
TEST_SCRIPT_DIR="$(srcdir)/" \
- $(SHELL) $(top_srcdir)/test/run_test.sh
+ bash $(top_srcdir)/test/run_test.sh
check_PROGRAMS = $(TESTS)
check_SCRIPTS = testscriptlist
diff --git a/paludis/args/Makefile.am b/paludis/args/Makefile.am
index d2efcc1..ddfdac1 100644
--- a/paludis/args/Makefile.am
+++ b/paludis/args/Makefile.am
@@ -31,7 +31,7 @@ libpaludisargs_a_SOURCES = $(paludis_args_include_HEADERS) \
missing_value.cc \
args_dumper.cc
-TESTS_ENVIRONMENT = env -u PALUDIS_OPTIONS TEST_SCRIPT_DIR="$(srcdir)/" $(SHELL) $(top_srcdir)/test/run_test.sh
+TESTS_ENVIRONMENT = env -u PALUDIS_OPTIONS TEST_SCRIPT_DIR="$(srcdir)/" bash $(top_srcdir)/test/run_test.sh
lib_LIBRARIES = libpaludisargs.a
check_PROGRAMS = $(TESTS)
diff --git a/paludis/config_file_TEST_cleanup.sh b/paludis/config_file_TEST_cleanup.sh
index d2f0bd8..b4ed3db 100755
--- a/paludis/config_file_TEST_cleanup.sh
+++ b/paludis/config_file_TEST_cleanup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
if [ -d config_file_TEST_dir ] ; then
diff --git a/paludis/config_file_TEST_setup.sh b/paludis/config_file_TEST_setup.sh
index 766011d..a35809b 100755
--- a/paludis/config_file_TEST_setup.sh
+++ b/paludis/config_file_TEST_setup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
mkdir config_file_TEST_dir || exit 2
diff --git a/paludis/portage_repository_TEST_cleanup.sh b/paludis/portage_repository_TEST_cleanup.sh
index e45cd73..8c0b290 100755
--- a/paludis/portage_repository_TEST_cleanup.sh
+++ b/paludis/portage_repository_TEST_cleanup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
if [ -d portage_repository_TEST_dir ] ; then
diff --git a/paludis/portage_repository_TEST_setup.sh b/paludis/portage_repository_TEST_setup.sh
index d63ad62..b0f4306 100755
--- a/paludis/portage_repository_TEST_setup.sh
+++ b/paludis/portage_repository_TEST_setup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
mkdir portage_repository_TEST_dir || exit 1
diff --git a/paludis/qa/Makefile.am.m4 b/paludis/qa/Makefile.am.m4
index 7e29d74..734b7b5 100644
--- a/paludis/qa/Makefile.am.m4
+++ b/paludis/qa/Makefile.am.m4
@@ -40,7 +40,7 @@ TESTS = testlist
TESTS_ENVIRONMENT = env \
PALUDIS_EBUILD_DIR="$(srcdir)/ebuild/" \
TEST_SCRIPT_DIR="$(srcdir)/" \
- $(SHELL) $(top_srcdir)/test/run_test.sh
+ bash $(top_srcdir)/test/run_test.sh
check_PROGRAMS = $(TESTS)
check_SCRIPTS = testscriptlist
diff --git a/paludis/qa/file_permissions_check_TEST_cleanup.sh b/paludis/qa/file_permissions_check_TEST_cleanup.sh
index 08bd40e..f86f9cc 100755
--- a/paludis/qa/file_permissions_check_TEST_cleanup.sh
+++ b/paludis/qa/file_permissions_check_TEST_cleanup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
if [ -d file_permissions_check_TEST_dir ] ; then
diff --git a/paludis/qa/file_permissions_check_TEST_setup.sh b/paludis/qa/file_permissions_check_TEST_setup.sh
index 34178f5..221286d 100755
--- a/paludis/qa/file_permissions_check_TEST_setup.sh
+++ b/paludis/qa/file_permissions_check_TEST_setup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
mkdir file_permissions_check_TEST_dir || exit 2
diff --git a/paludis/qa/has_ebuilds_check_TEST_cleanup.sh b/paludis/qa/has_ebuilds_check_TEST_cleanup.sh
index c32937f..d8b9da9 100755
--- a/paludis/qa/has_ebuilds_check_TEST_cleanup.sh
+++ b/paludis/qa/has_ebuilds_check_TEST_cleanup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
if [ -d has_ebuilds_check_TEST_dir ] ; then
diff --git a/paludis/qa/has_ebuilds_check_TEST_setup.sh b/paludis/qa/has_ebuilds_check_TEST_setup.sh
index 3f4c6a3..1b4f58a 100755
--- a/paludis/qa/has_ebuilds_check_TEST_setup.sh
+++ b/paludis/qa/has_ebuilds_check_TEST_setup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
mkdir has_ebuilds_check_TEST_dir || exit 2
diff --git a/paludis/qa/has_misc_files_check_TEST_cleanup.sh b/paludis/qa/has_misc_files_check_TEST_cleanup.sh
index d7655cc..8c6fb3a 100755
--- a/paludis/qa/has_misc_files_check_TEST_cleanup.sh
+++ b/paludis/qa/has_misc_files_check_TEST_cleanup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
if [ -d has_misc_files_check_TEST_dir ] ; then
diff --git a/paludis/qa/has_misc_files_check_TEST_setup.sh b/paludis/qa/has_misc_files_check_TEST_setup.sh
index b51a6b9..123f032 100755
--- a/paludis/qa/has_misc_files_check_TEST_setup.sh
+++ b/paludis/qa/has_misc_files_check_TEST_setup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
mkdir has_misc_files_check_TEST_dir || exit 2
diff --git a/paludis/qa/package_name_check_TEST_cleanup.sh b/paludis/qa/package_name_check_TEST_cleanup.sh
index 4da131e..fafc30e 100755
--- a/paludis/qa/package_name_check_TEST_cleanup.sh
+++ b/paludis/qa/package_name_check_TEST_cleanup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
if [ -d package_name_check_TEST_dir ] ; then
diff --git a/paludis/qa/package_name_check_TEST_setup.sh b/paludis/qa/package_name_check_TEST_setup.sh
index 1fd3df7..e7773a2 100755
--- a/paludis/qa/package_name_check_TEST_setup.sh
+++ b/paludis/qa/package_name_check_TEST_setup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
mkdir package_name_check_TEST_dir || exit 2
diff --git a/paludis/util/Makefile.am.m4 b/paludis/util/Makefile.am.m4
index 1dd8b29..71021e1 100644
--- a/paludis/util/Makefile.am.m4
+++ b/paludis/util/Makefile.am.m4
@@ -45,7 +45,7 @@ TESTS = testlist
TESTS_ENVIRONMENT = env \
PALUDIS_EBUILD_DIR="$(srcdir)/ebuild/" \
TEST_SCRIPT_DIR="$(srcdir)/" \
- $(SHELL) $(top_srcdir)/test/run_test.sh
+ bash $(top_srcdir)/test/run_test.sh
check_PROGRAMS = $(TESTS)
check_SCRIPTS = testscriptlist
diff --git a/paludis/util/dir_iterator_TEST_cleanup.sh b/paludis/util/dir_iterator_TEST_cleanup.sh
index 8d6e8ba..17378f3 100755
--- a/paludis/util/dir_iterator_TEST_cleanup.sh
+++ b/paludis/util/dir_iterator_TEST_cleanup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
if [ -d dir_iterator_TEST_dir ] ; then
diff --git a/paludis/util/dir_iterator_TEST_setup.sh b/paludis/util/dir_iterator_TEST_setup.sh
index 7ddb62b..930f2f5 100755
--- a/paludis/util/dir_iterator_TEST_setup.sh
+++ b/paludis/util/dir_iterator_TEST_setup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
mkdir dir_iterator_TEST_dir || exit 2
diff --git a/paludis/util/fs_entry_TEST_cleanup.sh b/paludis/util/fs_entry_TEST_cleanup.sh
index 894b1f7..662b2bb 100755
--- a/paludis/util/fs_entry_TEST_cleanup.sh
+++ b/paludis/util/fs_entry_TEST_cleanup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
if [ -d fs_entry_TEST_dir ] ; then
diff --git a/paludis/util/fs_entry_TEST_setup.sh b/paludis/util/fs_entry_TEST_setup.sh
index bec452e..7d7796b 100755
--- a/paludis/util/fs_entry_TEST_setup.sh
+++ b/paludis/util/fs_entry_TEST_setup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
mkdir fs_entry_TEST_dir || exit 2
diff --git a/paludis/util/is_file_with_extension_TEST_cleanup.sh b/paludis/util/is_file_with_extension_TEST_cleanup.sh
index 19f12d6..986933a 100755
--- a/paludis/util/is_file_with_extension_TEST_cleanup.sh
+++ b/paludis/util/is_file_with_extension_TEST_cleanup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
if [ -f "is_file_with_extension_TEST_file.goat" ] ; then
diff --git a/paludis/util/is_file_with_extension_TEST_setup.sh b/paludis/util/is_file_with_extension_TEST_setup.sh
index e5c8b59..bdfacbf 100755
--- a/paludis/util/is_file_with_extension_TEST_setup.sh
+++ b/paludis/util/is_file_with_extension_TEST_setup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
touch is_file_with_extension_TEST_file.goat || exit 2
diff --git a/paludis/vdb_repository_TEST_cleanup.sh b/paludis/vdb_repository_TEST_cleanup.sh
index 13ee375..e9f03a6 100755
--- a/paludis/vdb_repository_TEST_cleanup.sh
+++ b/paludis/vdb_repository_TEST_cleanup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
if [ -d vdb_repository_TEST_dir ] ; then
diff --git a/paludis/vdb_repository_TEST_setup.sh b/paludis/vdb_repository_TEST_setup.sh
index e88a3f3..e816209 100755
--- a/paludis/vdb_repository_TEST_setup.sh
+++ b/paludis/vdb_repository_TEST_setup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
mkdir -p vdb_repository_TEST_dir || exit 1
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ee3abf..807f55f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,7 @@ paludis_LDADD = \
TESTS_ENVIRONMENT = env \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_SKIP_CONFIG="yes" \
- $(SHELL) $(top_srcdir)/test/run_test.sh bash
+ bash $(top_srcdir)/test/run_test.sh bash
TESTS = version_TEST help_TEST list_sync_formats_TEST \
list_repository_formats_TEST list_dep_tag_categories_TEST
diff --git a/src/qualudis/Makefile.am b/src/qualudis/Makefile.am
index 7bf8b05..1fd9695 100644
--- a/src/qualudis/Makefile.am
+++ b/src/qualudis/Makefile.am
@@ -21,7 +21,7 @@ qualudis_LDADD = \
$(top_builddir)/paludis/libpaludis.a \
$(top_builddir)/paludis/util/libpaludisutil.a
-TESTS_ENVIRONMENT = env TEST_SCRIPT_DIR="$(srcdir)/" $(SHELL) $(top_srcdir)/test/run_test.sh bash
+TESTS_ENVIRONMENT = env TEST_SCRIPT_DIR="$(srcdir)/" bash $(top_srcdir)/test/run_test.sh bash
TESTS = version_TEST
version_TEST :
diff --git a/test/Makefile.am b/test/Makefile.am
index 83a1ec4..6d7aff8 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -12,7 +12,7 @@ libtest_a_SOURCES = \
XFAIL_TESTS = test_fail_TEST
TESTS = test_pass_TEST $(XFAIL_TESTS)
-TESTS_ENVIRONMENT = env TEST_SCRIPT_DIR="$(srcdir)/" $(SHELL) $(top_srcdir)/test/run_test.sh
+TESTS_ENVIRONMENT = env TEST_SCRIPT_DIR="$(srcdir)/" bash $(top_srcdir)/test/run_test.sh
check_LIBRARIES = libtest.a
check_PROGRAMS = $(TESTS) $(XFAIL_TESTS)
check_SCRIPTS = run_test.sh
diff --git a/test/run_test.sh b/test/run_test.sh
index 0663f77..3dc57a7 100755
--- a/test/run_test.sh
+++ b/test/run_test.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
if test -f "$TEST_SCRIPT_DIR""${2:-${1}}"_"setup.sh" ; then