Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 920898b
Enforce sh as the interpreter when needed
Baptiste Daroussin committed 7 years ago
commit 920898bb6f38f601d3577d1245695b98cb3bc12e
parent 6864e93
22 files changed +91 -91
modified tests/frontend/add.sh
@@ -15,7 +15,7 @@ tests_init \


initialize_pkg() {

	touch a
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test test 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1

	cat << EOF >> test.ucl

files: {

	${TMPDIR}/a: ""
@@ -96,7 +96,7 @@ add_force_body() {


add_accept_missing_body() {

	touch a
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test test 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1

	cat << EOF >> test.ucl

deps: {

	b: {
@@ -166,7 +166,7 @@ post-install


add_stdin_missing_body() {

	touch a
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test test 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1

	cat << EOF >> test.ucl

deps: {

	b: {
@@ -214,7 +214,7 @@ post-install
add_no_version_body() {



	for p in test test-lib final ; do
- 
		atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg ${p} ${p} 1
+ 
		atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg ${p} ${p} 1

		if [ ${p} = "final" ]; then

			cat << EOF >> final.ucl

deps {
modified tests/frontend/autoremove.sh
@@ -11,7 +11,7 @@ autoremove_prep() {
	touch file1

	touch file2
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg1 test 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg1 test 1

	cat << EOF >> pkg1.ucl

files: {

	${TMPDIR}/file1: "",
@@ -19,7 +19,7 @@ files: {
}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg dep1 master 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg dep1 master 1

	cat << EOF >> dep1.ucl

deps: {

	test {
modified tests/frontend/autoupgrade.sh
@@ -8,8 +8,8 @@ tests_init \


autoupgrade_body() {
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg1 pkg 1
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg2 pkg 1_1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg1 pkg 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg2 pkg 1_1



	atf_check \

		-o match:".*Installing.*\.\.\.$" \
@@ -48,8 +48,8 @@ autoupgrade_multirepo_head() {


autoupgrade_multirepo_body() {
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg1 pkg 1
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg2 pkg 1.1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg1 pkg 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg2 pkg 1.1



	atf_check \

		-o match:".*Installing.*\.\.\.$" \
modified tests/frontend/config.sh
@@ -14,7 +14,7 @@ duplicatedefault: 2
EOF



	for n in 1 2; do
- 
		atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test${n} test ${n}
+ 
		atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test${n} test ${n}

		echo 'allowduplicate: true' >> test${n}.ucl



	atf_check \
@@ -34,7 +34,7 @@ done


duplicate_pkgs_notallowed_body() {

	for n in 1 2; do
- 
		atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test${n} test ${n}
+ 
		atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test${n} test ${n}

	done



	atf_check \
modified tests/frontend/configmerge.sh
@@ -10,7 +10,7 @@ tests_init \


config_body()

{
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"

	echo "@config ${TMPDIR}/a" > plist



	echo "entry" > a
@@ -32,7 +32,7 @@ config_body()
		-o inline:"entry\naddition\n" \

		cat ${TMPDIR}/target/${TMPDIR}/a
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "2"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "2"

	echo "entry 2" > a



	atf_check \
@@ -50,7 +50,7 @@ config_body()


config_fileexist_body()

{
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"

	echo "${TMPDIR}/a" > plist



	echo "entry" > a
@@ -68,7 +68,7 @@ config_fileexist_body()
		-o inline:"entry\naddition\n" \

		cat ${TMPDIR}/target/${TMPDIR}/a
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "2"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "2"

	echo "entry 2" > a

	echo "@config ${TMPDIR}/a" > plist
@@ -86,7 +86,7 @@ config_fileexist_body()
config_hardlink_body()

{

	# Create a pkg
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1.0"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1.0"

	echo "line 1" > a

	echo "line 2" >> a

	ln a b
@@ -110,7 +110,7 @@ config_hardlink_body()
	echo "line 2" >> target/a



	# Create an updated pkg
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1.1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1.1"

	echo "line 1" > a

	echo "line 2" >> a

	echo "@config /a" > plist
@@ -139,7 +139,7 @@ config_fileexist_notinpkg_body()
	echo "entry" > ${TMPDIR}/target/${TMPDIR}/a

	unset PKG_DBDIR
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "2"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "2"

	echo "entry 2" > a

	echo "@config ${TMPDIR}/a" > plist
@@ -156,7 +156,7 @@ config_fileexist_notinpkg_body()


config_morecomplicated_body()

{
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"

	echo "entry1" > test.config

	echo "entry3" >> test.config

	echo "@config ${TMPDIR}/test.config" > plist
@@ -183,7 +183,7 @@ config_morecomplicated_body()
		-o inline:"entry1\nentry3\nentry4\n" \

		cat ${TMPDIR}/target/${TMPDIR}/test.config
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "2"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "2"

	echo "entry1" > test.config

	echo "entry2" >> test.config

	echo "entry3" >> test.config
modified tests/frontend/conflicts.sh
@@ -12,7 +12,7 @@ tests_init \
# bar1 and bar conflict with each other

complex_conflicts_body() {

	echo "bar-1.0" > file1
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg bar bar 1.0 "${TMPDIR}"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg bar bar 1.0 "${TMPDIR}"

	cat << EOF >> bar.ucl

files: {

	${TMPDIR}/file1: "",
@@ -25,7 +25,7 @@ EOF
		-s exit:0 \

		pkg create -M ./bar.ucl -o ./repo/
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg foo foo 1.0 "${TMPDIR}"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg foo foo 1.0 "${TMPDIR}"

	cat << EOF >> foo.ucl

deps: {

	bar: {
@@ -68,7 +68,7 @@ EOF
	# Upgrade bar

	rm -fr repo

	echo "bar-2.0" > file1
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg bar bar 2.0 "${TMPDIR}"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg bar bar 2.0 "${TMPDIR}"

	cat << EOF >> bar.ucl

files: {

	${TMPDIR}/file1: "",
@@ -83,7 +83,7 @@ EOF


	# Create bar1-1.1

	echo "bar-1.1" > file1
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg bar1 bar1 1.1 "${TMPDIR}"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg bar1 bar1 1.1 "${TMPDIR}"

	cat << EOF >> bar1.ucl

files: {

	${TMPDIR}/file1: "",
@@ -96,7 +96,7 @@ EOF
		-s exit:0 \

		pkg create -M ./bar1.ucl -o ./repo/
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg foo foo 1.0_1 "${TMPDIR}"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg foo foo 1.0_1 "${TMPDIR}"

	cat << EOF >> foo.ucl

deps: {

	bar1: {
@@ -172,7 +172,7 @@ Number of packages to be upgraded: 1


find_conflicts_body() {

	touch a
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_manifest test 1 /
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_manifest test 1 /

	cat << EOF >> +MANIFEST

files: {

	${TMPDIR}/a: "",
@@ -184,7 +184,7 @@ EOF
		-s exit:0 \

		pkg register -M +MANIFEST
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_manifest test2 1 /
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_manifest test2 1 /

	cat << EOF >> +MANIFEST

files: {

	${TMPDIR}/a: "",
modified tests/frontend/create.sh
@@ -55,7 +55,7 @@ basic_validation() {
}



create_with_hardlink_body() {
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1.0"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1.0"

	echo "blah" >> foo

	ln foo bar

	echo "@(root,wheel,0555,) /foo" >> test.plist
modified tests/frontend/delete.sh
@@ -10,9 +10,9 @@ tests_init \
	simple_delete_prefix_ending_with_slash



delete_all_body() {
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "foo" "foo" "1"
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "pkg" "pkg" "1"
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "foo" "foo" "1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "pkg" "pkg" "1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"



	atf_check -o ignore pkg register -M foo.ucl

	atf_check -o ignore pkg register -M pkg.ucl
@@ -22,7 +22,7 @@ delete_all_body() {
}



delete_pkg_body() {
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "pkg" "pkg" "1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "pkg" "pkg" "1"

	atf_check -o ignore pkg register -M pkg.ucl

	atf_check -o ignore -e ignore -s exit:3 pkg delete -y pkg

	atf_check -o ignore -e ignore pkg delete -yf pkg
@@ -33,7 +33,7 @@ simple_delete_body() {
	mkdir dir

	touch dir/file2
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1" "${TMPDIR}"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1" "${TMPDIR}"

	cat << EOF >> test.ucl

files: {

    ${TMPDIR}/file1: "",
@@ -64,7 +64,7 @@ simple_delete_prefix_ending_with_slash_body() {
	mkdir dir

	touch dir/file2
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1" "${TMPDIR}/"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1" "${TMPDIR}/"

	cat << EOF >> test.ucl

files: {

    ${TMPDIR}/file1: "",
@@ -95,7 +95,7 @@ delete_with_directory_owned_body() {
	mkdir dir

	touch dir/file2
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1" "${TMPDIR}/"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1" "${TMPDIR}/"

	cat << EOF >> test.ucl

files: {

    ${TMPDIR}/file1: "",
@@ -103,7 +103,7 @@ files: {
}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test2" "test2" "1" "${TMPDIR}/"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test2" "test2" "1" "${TMPDIR}/"

	cat << EOF >> test2.ucl

directories: {

    ${TMPDIR}/dir: 'y',
modified tests/frontend/extract.sh
@@ -14,7 +14,7 @@ tests_init \
basic_body()

{

	echo "test" > a
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"

cat << EOF >> test.ucl

files = {

	${TMPDIR}/a: ""
@@ -70,7 +70,7 @@ ${TMPDIR}/target${TMPDIR}/a
basic_dirs_body()

{

	mkdir ${TMPDIR}/plop
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"

cat << EOF >> test.ucl

directories = {

	${TMPDIR}/plop: y
@@ -98,7 +98,7 @@ setuid_body()
{

	touch ${TMPDIR}/a

	chmod 04554 ${TMPDIR}/a || atf_fail "Fail to chmod"
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"

	cat << EOF >> test.ucl

files = {

	${TMPDIR}/a = ""
@@ -136,7 +136,7 @@ setuid_hardlinks_body()
	ln ${TMPDIR}/a ${TMPDIR}/b

	chmod 04554 ${TMPDIR}/a || atf_fail "Fail to chmod"

	chmod 04554 ${TMPDIR}/b || atf_fail "Fail to chmod"
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"

	cat << EOF >> test.ucl

files = {

	${TMPDIR}/a = ""
@@ -184,7 +184,7 @@ chflags_body()
	# use nodump as it is the only one supported as user, by zfs and by

	# libarchive

	touch ${TMPDIR}/a
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"

	echo "@(,,,nodump) ${TMPDIR}/a" > test.plist

	atf_check \

		-o empty \
@@ -214,7 +214,7 @@ chflags_schg_body()
	test $(id -u) = 0 || atf_skip "Can only be run as root"



	touch ${TMPDIR}/a
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"

	echo "@(root,wheel,,schg) ${TMPDIR}/a" > test.plist

	atf_check \

		-o empty \
@@ -253,7 +253,7 @@ chflags_schg_cleanup()


symlinks_body()

{
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"

	cat << EOF >> test.ucl

files: {

${TMPDIR}/a = "";
modified tests/frontend/install.sh
@@ -12,7 +12,7 @@ metalog_body()
{

        atf_skip_on Linux Test fails on Linux
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test test 1 / || atf_fail "Failed to create the ucl file"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1 / || atf_fail "Failed to create the ucl file"

	touch ${TMPDIR}/testfile1 || atf_fail "Failed to create the temp file"

	echo "@(root,wheel,640,) testfile1" > test.plist

	echo "test123" > ${TMPDIR}/testfile2 || atf_fail "Failed to create the temp file"
@@ -71,7 +71,7 @@ EOF


reinstall_body()

{
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test test 1 /usr/local
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1 /usr/local



	atf_check \

		-o ignore \
@@ -106,7 +106,7 @@ EOF


pre_script_fail_body()

{
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test test 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1

	cat << EOF >> test.ucl

scripts: {

   pre-install: "exit 1"
@@ -127,7 +127,7 @@ EOF


post_script_ignored_body()

{
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test test 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1

	cat << EOF >> test.ucl

scripts: {

   post-install: "exit 1"
modified tests/frontend/issue1445.sh
@@ -8,7 +8,7 @@ tests_init \




dead_symlink_body() {
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"

	cat << EOF >> test.ucl

directories {

	${TMPDIR}/plop = "y";
@@ -27,7 +27,7 @@ EOF
}



good_symlink_body() {
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"

	cat << EOF >> test.ucl

directories {

	${TMPDIR}/plop = "y";
modified tests/frontend/multipleprovider.sh
@@ -8,7 +8,7 @@ tests_init \
multiple_providers_body() {

	touch file
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg1 test1 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg1 test1 1

	cat << EOF >> pkg1.ucl

shlibs_provided [

	"lib1.so.6"
@@ -18,7 +18,7 @@ files: {
}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg2 dep 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg2 dep 1

	cat << EOF >> pkg2.ucl

shlibs_required [

	"lib1.so.6"
@@ -39,7 +39,7 @@ EOF
			pkg register -M ${p}.ucl

	done
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg3 test1 1_0
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg3 test1 1_0

	cat << EOF >> pkg3.ucl

shlibs_provided [

	"lib1.so.6"
@@ -49,7 +49,7 @@ files: {
}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg4 test2 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg4 test2 1

	cat << EOF >> pkg4.ucl

shlibs_provided [

	"lib1.so.6"
@@ -59,7 +59,7 @@ files: {
}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg5 dep 1_1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg5 dep 1_1

	cat << EOF >> pkg5.ucl

shlibs_required [

	"lib1.so.6"
modified tests/frontend/packagemerge.sh
@@ -10,28 +10,28 @@ package_merge_body() {
	touch file2

	touch file3
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg1 test-file1 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg1 test-file1 1

	cat << EOF >> pkg1.ucl

files: {

	${TMPDIR}/file1: "",

}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg2 test-file2 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg2 test-file2 1

	cat << EOF >> pkg2.ucl

files: {

	${TMPDIR}/file2: "",

}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg3 test-file3 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg3 test-file3 1

	cat << EOF >> pkg3.ucl

files: {

	${TMPDIR}/file3: "",

}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg4 test 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg4 test 1

	cat << EOF >> pkg4.ucl

deps: {

	test-file1: {
@@ -49,7 +49,7 @@ deps: {
}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg dep1 test1 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg dep1 test1 1

	cat << EOF >> dep1.ucl

deps: {

	test-file1: {
@@ -67,7 +67,7 @@ EOF
			pkg register -M ${p}.ucl

	done
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg5 test 1.1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg5 test 1.1

	cat << EOF >> pkg5.ucl

files: {

	${TMPDIR}/file1: "",
@@ -76,7 +76,7 @@ files: {
}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg dep2 test1 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg dep2 test1 1

	cat << EOF >> dep2.ucl

deps: {

	test: {
modified tests/frontend/packagesplit.sh
@@ -9,7 +9,7 @@ package_split_body() {
	touch file1

	touch file2
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg1 test 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg1 test 1

	cat << EOF >> pkg1.ucl

files: {

	${TMPDIR}/file1: "",
@@ -17,7 +17,7 @@ files: {
}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg dep1 master 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg dep1 master 1

	cat << EOF >> dep1.ucl

deps: {

	test {
@@ -27,21 +27,21 @@ deps: {
}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg2 sub-test 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg2 sub-test 1

	cat << EOF >> pkg2.ucl

files: {

	${TMPDIR}/file1: "",

}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg3 sub-test2 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg3 sub-test2 1

	cat << EOF >> pkg3.ucl

files: {

	${TMPDIR}/file2: "",

}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg pkg4 test 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg pkg4 test 1

	cat << EOF >> pkg4.ucl

deps: {

	sub-test: {
modified tests/frontend/query.sh
@@ -8,7 +8,7 @@ tests_init \
query_body() {

	touch plop

	touch bla
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test test 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1

	cat >> test.ucl << EOF

options: {

	"OPT1": "on"
modified tests/frontend/register.sh
@@ -11,7 +11,7 @@ register_conflicts_body() {
	mkdir -p teststage/${TMPDIR}

	echo a > teststage/${TMPDIR}/plop

	sum=$(openssl dgst -sha256 -binary teststage/${TMPDIR}/plop | hexdump -v -e '/1 "%x"')
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test test 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1

	cat >> test.ucl << EOF

files: {

	"${TMPDIR}/plop" : "$sum"
@@ -26,7 +26,7 @@ EOF
	atf_check_equal ${sum} ${nsum}

	rm -f test.ucl

	echo b > teststage/${TMPDIR}/plop
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test test2 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test2 1

	cat >> test.ucl << EOF

files: {

	"${TMPDIR}/plop" : "$sum2"
@@ -42,7 +42,7 @@ EOF
}



register_message_body() {
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_manifest test1 1 "${TMPDIR}"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_manifest test1 1 "${TMPDIR}"

	cat << EOF > +DISPLAY

message

EOF
@@ -55,7 +55,7 @@ message
	atf_check -o match:"message" pkg register -m .

	atf_check -o inline:"${OUTPUT}" pkg info -D test1
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_manifest test2 1 "${TMPDIR}"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_manifest test2 1 "${TMPDIR}"

	cat << EOF > +DISPLAY

[

	{ message: "hey"},
@@ -81,7 +81,7 @@ remove


prefix_is_a_symlink_body()

{
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"

	mkdir -p ${TMPDIR}/${TMPDIR}/plop/bla

	echo "something" > ${TMPDIR}/${TMPDIR}/plop/bla/a

	ln ${TMPDIR}/${TMPDIR}/plop/bla/a ${TMPDIR}/${TMPDIR}/plop/bla/b
modified tests/frontend/repo.sh
@@ -9,7 +9,7 @@ tests_init \
repo_body() {

	touch plop

	touch bla
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test test 1 "${TMPDIR}"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1 "${TMPDIR}"

	cat >> test.ucl << EOF

files: {

	"${TMPDIR}/plop": ""
@@ -59,8 +59,8 @@ EOF
}



repo_multiversion_body() {
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test test 1.0 "${TMPDIR}"
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test1 test 1.1 "${TMPDIR}"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1.0 "${TMPDIR}"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test1 test 1.1 "${TMPDIR}"

	for i in test test1; do

		atf_check pkg create -M $i.ucl

	done
modified tests/frontend/requires.sh
@@ -13,12 +13,12 @@ local1: {
}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg a a 1.0
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg a a 1.0

	cat << EOF >> a.ucl

provides: [a-1]

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg b b 1.0
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg b b 1.0

	cat << EOF >> b.ucl

requires: [a-1]

EOF
modified tests/frontend/rubypuppet.sh
@@ -15,7 +15,7 @@ pkg_puppet_body() {
	touch rubygemhiera.file

	touch rubygems.file
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg rubygemrubyaugeas rubygem-ruby-augeas 1.0
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg rubygemrubyaugeas rubygem-ruby-augeas 1.0

	cat << EOF >> rubygemrubyaugeas.ucl

deps: {

	ruby: {
@@ -32,7 +32,7 @@ files: {
}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg puppet puppet 1.0
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg puppet puppet 1.0

	cat << EOF >> puppet.ucl

deps: {

	ruby: {
@@ -53,7 +53,7 @@ files: {
}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg ruby ruby 2.0
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg ruby ruby 2.0

	cat << EOF >> ruby.ucl

shlibs_provided [

	"libruby20.so.20",
@@ -63,7 +63,7 @@ files: {
}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg rubygem-hiera rubygem-hiera 1.0
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg rubygem-hiera rubygem-hiera 1.0

	cat << EOF >> rubygem-hiera.ucl

deps: {

	ruby: {
@@ -80,7 +80,7 @@ files: {
}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg ruby-gems20 ruby20-gems 1.0
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg ruby-gems20 ruby20-gems 1.0

	cat << EOF >> ruby-gems20.ucl

deps: {

	ruby {
@@ -124,7 +124,7 @@ EOF
	rm -f *.ucl

	rm *.txz
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg rubygemrubyaugeas.new rubygem-ruby-augeas 1.0
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg rubygemrubyaugeas.new rubygem-ruby-augeas 1.0

	cat << EOF >> rubygemrubyaugeas.new.ucl

deps: {

	ruby: {
@@ -141,7 +141,7 @@ files: {
}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg puppet.new puppet 1.0
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg puppet.new puppet 1.0

	cat << EOF >> puppet.new.ucl

deps: {

	ruby: {
@@ -162,7 +162,7 @@ files: {
}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg ruby.new ruby 2.1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg ruby.new ruby 2.1

	cat << EOF >> ruby.new.ucl

shlibs_provided [

	"libruby21.so.21",
@@ -172,7 +172,7 @@ files: {
}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg rubygem-hiera.new rubygem-hiera 1.0
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg rubygem-hiera.new rubygem-hiera 1.0

	cat << EOF >> rubygem-hiera.new.ucl

deps: {

	ruby: {
@@ -189,7 +189,7 @@ files: {
	}

EOF
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg ruby-gems21.new ruby21-gems 1.0
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg ruby-gems21.new ruby21-gems 1.0

	cat << EOF >> ruby-gems21.new.ucl

deps: {

	ruby {
modified tests/frontend/set.sh
@@ -10,7 +10,7 @@ tests_init \


initialize_pkg() {
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test test 1
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1

	sed -i'' -e 's#origin.*#origin: origin/test#' test.ucl



	atf_check \
modified tests/frontend/version.sh
@@ -14,7 +14,7 @@ version_body() {
}



compare_body() {
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg test test 5.20_3
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 5.20_3



	atf_check \

		-o match:".*Installing.*" \
modified tests/frontend/vital.sh
@@ -7,7 +7,7 @@ tests_init \


vital_body()

{
- 
	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"
+ 
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"

	cat << EOF >> test.ucl

vital = true;

EOF