Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 4cad403
catch up with the default package extension
Baptiste Daroussin committed 5 years ago
commit 4cad4038611012aae49b622ba4a54963b907338e
parent 71a4890
14 files changed +115 -115
modified tests/frontend/add.sh
@@ -48,7 +48,7 @@ post-install
	atf_check \

		-o inline:"${OUTPUT}" \

		-e empty \
- 
		pkg add test-1.txz
+ 
		pkg add test-1.bsd



# test automatic is not set

	atf_check \
@@ -68,7 +68,7 @@ post-install
	atf_check \

		-o inline:"${OUTPUT}" \

		-e empty \
- 
		pkg add -A test-1.txz
+ 
		pkg add -A test-1.bsd



	atf_check \

		-o inline:"1\n" \
@@ -83,10 +83,10 @@ add_noscript_body() {
OUTPUT="${JAILED}Installing test-1...

${JAILED}Extracting test-1:  done

"
- 
	cat test-1.txz | atf_check \
+ 
	cat test-1.bsd | atf_check \

		-o inline:"${OUTPUT}" \

		-e empty \
- 
		pkg add -I test-1.txz
+ 
		pkg add -I test-1.bsd

}



add_force_body() {
@@ -124,10 +124,10 @@ EOF
		pkg create -M test.ucl



	atf_check \
- 
		-o inline:"${JAILED}Installing test-1...\n\nFailed to install the following 1 package(s): test-1.txz\n" \
+ 
		-o inline:"${JAILED}Installing test-1...\n\nFailed to install the following 1 package(s): test-1.bsd\n" \

		-e inline:"${PROGNAME}: Missing dependency 'b'\n" \

		-s exit:1 \
- 
		pkg add test-1.txz
+ 
		pkg add test-1.bsd



OUTPUT="${JAILED}Installing test-1...

pre-install
@@ -138,7 +138,7 @@ post-install
		-o inline:"${OUTPUT}" \

		-e inline:"${PROGNAME}: Missing dependency 'b'\n" \

		-s exit:0 \
- 
		pkg add -M test-1.txz
+ 
		pkg add -M test-1.bsd

}



add_quiet_body() {
@@ -147,7 +147,7 @@ add_quiet_body() {
	atf_check \

		-o inline:"pre-install\npost-install\n" \

		-e empty \
- 
		pkg add -q ./test-1.txz
+ 
		pkg add -q ./test-1.bsd

}



add_stdin_body() {
@@ -158,7 +158,7 @@ pre-install
${JAILED}Extracting test-1:  done

post-install

"
- 
	cat test-1.txz | atf_check \
+ 
	cat test-1.bsd | atf_check \

		-o inline:"${OUTPUT}" \

		-e empty \

		pkg add -
@@ -193,7 +193,7 @@ EOF
		-s exit:0 \

		pkg create -M test.ucl
- 
	cat test-1.txz | atf_check \
+ 
	cat test-1.bsd | atf_check \

		-o inline:"${JAILED}Installing test-1...\n\nFailed to install the following 1 package(s): -\n" \

		-e inline:"${PROGNAME}: Missing dependency 'b'\n" \

		-s exit:1 \
@@ -204,7 +204,7 @@ pre-install
${JAILED}Extracting test-1:  done

post-install

"
- 
	cat test-1.txz | atf_check \
+ 
	cat test-1.bsd | atf_check \

		-o inline:"${OUTPUT}" \

		-e inline:"${PROGNAME}: Missing dependency 'b'\n" \

		-s exit:0 \
@@ -228,5 +228,5 @@ EOF
			pkg create -M ${p}.ucl

	done

	atf_check -o ignore -s exit:0 \
- 
		pkg add final-1.txz
+ 
		pkg add final-1.bsd

}
modified tests/frontend/backup_lib.sh
@@ -41,13 +41,13 @@ EOF
		-e empty \

		-o empty \

		-s exit:0 \
- 
		pkg -o BACKUP_LIBRARIES=true -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o BACKUP_LIBRARIES=true -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd



	atf_check \

		-e empty \

		-o empty \

		-s exit:0 \
- 
		pkg -o BACKUP_LIBRARIES=true -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/foo-1.txz
+ 
		pkg -o BACKUP_LIBRARIES=true -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/foo-1.bsd



	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "2"
@@ -55,7 +55,7 @@ EOF
		-s exit:0 \

		pkg create -M test.ucl
- 
	rm test-1.txz
+ 
	rm test-1.bsd

	atf_check \

		-o ignore \

		-s exit:0 pkg repo .
@@ -81,7 +81,7 @@ EOF
	atf_check \

		-o inline:"/back/libempty.so.1\n" \

		pkg -r ${TMPDIR}/target query "%Fp" compat-libraries
- 
	rm foo-1.txz
+ 
	rm foo-1.bsd

	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "foo" "foo" "2"

	atf_check \

		-s exit:0 \
modified tests/frontend/clean.sh
@@ -18,7 +18,7 @@ basic_body() {
		-e empty \

		-o ignore \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd



	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "2"
@@ -49,7 +49,7 @@ EOF
	mv test-* cache

	atf_check \

		-e empty \
- 
		-o match:"test-.\.txz" \
+ 
		-o match:"test-.\.bsd" \

		-s exit:0 \

		pkg -C /dev/null -o PKG_CACHEDIR=${TMPDIR}/cache -o REPOS_DIR="${TMPDIR}/reposconf" clean -n

}
modified tests/frontend/configmerge.sh
@@ -21,12 +21,12 @@ config_body()


	atf_check \

		-o match:"^config" \
- 
		pkg info -R --raw-format ucl -F ${TMPDIR}/test-1.txz
+ 
		pkg info -R --raw-format ucl -F ${TMPDIR}/test-1.bsd



	mkdir ${TMPDIR}/target

	unset PKG_DBDIR

	atf_check \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy ${TMPDIR}/test-1.bsd

	test -f ${TMPDIR}/target/${TMPDIR}/a || atf_fail "file absent"

	echo "addition" >> ${TMPDIR}/target/${TMPDIR}/a

	atf_check \
@@ -63,7 +63,7 @@ config_fileexist_body()
	mkdir ${TMPDIR}/target

	unset PKG_DBDIR

	atf_check \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy ${TMPDIR}/test-1.bsd

	test -f ${TMPDIR}/target/${TMPDIR}/a || atf_fail "file absent"

	echo "addition" >> ${TMPDIR}/target/${TMPDIR}/a

	atf_check \
@@ -99,7 +99,7 @@ config_filenotexist_body()
	mkdir ${TMPDIR}/target

	unset PKG_DBDIR

	atf_check \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy ${TMPDIR}/test-1.bsd

	test -f ${TMPDIR}/target/${TMPDIR}/a || atf_fail "file absent"

	echo "addition" >> ${TMPDIR}/target/${TMPDIR}/a

	atf_check \
@@ -145,7 +145,7 @@ config_hardlink_body()
	# Install the pkg

	atf_check \

		pkg -o REPOS_DIR=${TMPDIR}/reposconf -r ${TMPDIR}/target install -qy test
- 
	rm *.txz
+ 
	rm *.bsd



	# Modify the local config

	echo "line 1a" > target/a
@@ -209,12 +209,12 @@ config_morecomplicated_body()


	atf_check \

		-o match:"^config" \
- 
		pkg info -R --raw-format ucl -F ${TMPDIR}/test-1.txz
+ 
		pkg info -R --raw-format ucl -F ${TMPDIR}/test-1.bsd



	mkdir ${TMPDIR}/target

	unset PKG_DBDIR

	atf_check \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy ${TMPDIR}/test-1.bsd

	test -f ${TMPDIR}/target/${TMPDIR}/test.config || atf_fail "file absent"



	atf_check \
modified tests/frontend/create.sh
@@ -59,8 +59,8 @@ preparetestcredentials() {
}



basic_validation() {
- 
	test -f test-1.txz || atf_fail "Package not created"
- 
	xz -t test-1.txz || atf_fail "XZ integrity check failed"
+ 
	test -f test-1.bsd || atf_fail "Package not created"
+ 
	xz -t test-1.bsd || atf_fail "XZ integrity check failed"

}



create_with_hardlink_body() {
@@ -92,7 +92,7 @@ create_from_plist_body() {
		-o match:"-rw-r--r-- .*root[ /]+wheel.* /file1$" \

		-e ignore \

		-s exit:0 \
- 
		tar tvf test-1.txz
+ 
		tar tvf test-1.bsd

}



create_from_plist_set_owner_body() {
@@ -110,7 +110,7 @@ create_from_plist_set_owner_body() {
		-o match:"-rw-r--r-- .*plop[ /]+wheel.* /file1$" \

		-e ignore \

		-s exit:0 \
- 
		tar tvf test-1.txz
+ 
		tar tvf test-1.bsd

}



create_from_plist_set_group_body() {
@@ -128,7 +128,7 @@ create_from_plist_set_group_body() {
		-o match:"-rw-r--r-- .*root[ /]+bla.* /file1$" \

		-e ignore \

		-s exit:0 \
- 
		tar tvf test-1.txz
+ 
		tar tvf test-1.bsd

}
@@ -147,7 +147,7 @@ create_from_plist_set_group_space_body() {
		-o match:"-rw-r--r-- .*root[ /]+bla.* /file1$" \

		-e ignore \

		-s exit:0 \
- 
		tar tvf test-1.txz
+ 
		tar tvf test-1.bsd

}



create_from_plist_gather_mode_body() {
@@ -167,7 +167,7 @@ create_from_plist_gather_mode_body() {
		-o match:"-rwxrwxrwx .*plop[ /]+bla.* /file1$" \

		-e ignore \

		-s exit:0 \
- 
		tar tvf test-1.txz
+ 
		tar tvf test-1.bsd

}



create_from_plist_set_mode_body() {
@@ -185,7 +185,7 @@ create_from_plist_set_mode_body() {
		-o match:"-rwxr-sr-x .*root[ /]+wheel.* /file1$" \

		-e ignore \

		-s exit:0 \
- 
		tar tvf test-1.txz
+ 
		tar tvf test-1.bsd

}



create_from_plist_mini_body() {
@@ -203,7 +203,7 @@ create_from_plist_mini_body() {
		-o match:"-rw-r--r-- .*plop[ /]+wheel.* /file1$" \

		-e ignore \

		-s exit:0 \
- 
		tar tvf test-1.txz
+ 
		tar tvf test-1.bsd

}



create_from_plist_dirrm_body() {
@@ -239,7 +239,7 @@ aline"
		-o inline:"+COMPACT_MANIFEST\n+MANIFEST\n" \

		-e empty \

		-s exit:0 \
- 
		tar tf test-1.txz
+ 
		tar tf test-1.bsd



	atf_check \

		-o empty \
@@ -294,7 +294,7 @@ mkdir target


	atf_check \

		-o inline:"yes\nfile1\nyes\nA\nB\nC\nD\n" \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd

}



create_from_plist_keyword_validation_body() {
@@ -478,7 +478,7 @@ EOF
		-o file:output.ucl \

		-e empty \

		-s exit:0 \
- 
		pkg info -R --raw-format=ucl -F test-1.txz
+ 
		pkg info -R --raw-format=ucl -F test-1.bsd

}



create_from_manifest_and_plist_body() {
@@ -516,7 +516,7 @@ EOF
		-o file:output.ucl \

		-e empty \

		-s exit:0 \
- 
		pkg info -R --raw-format=ucl -F test-1.txz
+ 
		pkg info -R --raw-format=ucl -F test-1.bsd

}



create_from_manifest_body() {
@@ -558,7 +558,7 @@ EOF
		-o file:output.ucl \

		-e empty \

		-s exit:0 \
- 
		pkg info -R --raw-format=ucl -F test-1.txz
+ 
		pkg info -R --raw-format=ucl -F test-1.bsd

}



create_from_manifest_dir_body() {
@@ -591,7 +591,7 @@ Message


"

	atf_check pkg create -m . -r ${TMPDIR}
- 
	atf_check -o inline:"${OUTPUT}" pkg info -D -F ./test-1.txz
+ 
	atf_check -o inline:"${OUTPUT}" pkg info -D -F ./test-1.bsd



cat << EOF > ./+DISPLAY

[
@@ -610,7 +610,7 @@ message upgrade
'



	atf_check pkg create -m . -r ${TMPDIR}
- 
	atf_check -o inline:"${OUTPUT}" pkg info -D -F ./test-1.txz
+ 
	atf_check -o inline:"${OUTPUT}" pkg info -D -F ./test-1.bsd



}
@@ -629,7 +629,7 @@ create_from_plist_hash_body() {
		-o ignore \

		-e empty \

		-s exit:0 \
- 
		ls test-1-*.txz
+ 
		ls test-1-*.bsd

}



create_from_plist_with_keyword_and_message_body() {
@@ -662,7 +662,7 @@ on install


'

	atf_check pkg -o PLIST_KEYWORDS_DIR=. create -m . -r ${TMPDIR} -p test.plist
- 
	atf_check -o inline:"${OUTPUT}" pkg info -D -F ./test-1.txz
+ 
	atf_check -o inline:"${OUTPUT}" pkg info -D -F ./test-1.bsd



}
@@ -679,24 +679,24 @@ EOF
	atf_check env SOURCE_DATE_EPOCH=86400 pkg create -M test.ucl

	atf_check \

		-o match:"0 Jan +2 +1970.*/a" \
- 
		tar tvf test-1.txz
+ 
		tar tvf test-1.bsd

	atf_check -e match:"Invalid" -s exit:1 pkg create -t meh -M test.ucl

	atf_check pkg create -t 172800 -M test.ucl

	atf_check \

		-o match:"0 Jan +3 +1970.*/a" \
- 
		tar tvf test-1.txz
+ 
		tar tvf test-1.bsd

	atf_check env SOURCE_DATE_EPOCH=86400 pkg create -t 172800 -M test.ucl

	atf_check \

		-o match:"0 Jan +3 +1970.*/a" \
- 
		tar tvf test-1.txz
+ 
		tar tvf test-1.bsd

	atf_check pkg create -M test.ucl

	atf_check \

		-o match:"${pattern}" \
- 
		tar tvf test-1.txz
+ 
		tar tvf test-1.bsd



	mkdir target

	atf_check -o empty \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd

	atf_check \

		-o match:"${pattern}" \

		ls -l ${TMPDIR}/target/${TMPDIR}/a
@@ -733,7 +733,7 @@ EOF
		-s exit:0 \

		pkg create -o ${TMPDIR} -m . -p test.plist -r .
- 
	atf_check -o inline:"/file1\n/file3\n/file2\n" pkg info -ql -F test*.txz
+ 
	atf_check -o inline:"/file1\n/file3\n/file2\n" pkg info -ql -F test*.bsd

	cat << EOF >> other-plist

@include test.plist

EOF
@@ -784,7 +784,7 @@ touch A B


	atf_check \

		-o match:"-rw-r--r-- .*plop[ /]+wheel.* /A$" \
- 
		tar tvf test-1.txz
+ 
		tar tvf test-1.bsd

}



create_from_plist_keyword_deprecated_body()
modified tests/frontend/extract.sh
@@ -33,7 +33,7 @@ EOF
		-e empty \

		-s exit:0 \

		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy \
- 
			${TMPDIR}/test-1.txz
+ 
			${TMPDIR}/test-1.bsd



OUTPUT="${TMPDIR}/target/local.sqlite

${TMPDIR}/target${TMPDIR}/a
@@ -57,7 +57,7 @@ ${TMPDIR}/target${TMPDIR}/a
		-e empty \

		-s exit:0 \

		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy \
- 
			${TMPDIR}/test-1.txz
+ 
			${TMPDIR}/test-1.bsd



	atf_check \

		-o inline:"${OUTPUT}" \
@@ -89,7 +89,7 @@ EOF
		-e empty \

		-s exit:0 \

		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy \
- 
			${TMPDIR}/test-1.txz
+ 
			${TMPDIR}/test-1.bsd



	test -d ${TMPDIR}/target${TMPDIR}/plop || atf_fail "directory not extracted"

}
@@ -113,7 +113,7 @@ EOF
	atf_check \

		-o match:"^-r-sr-xr-- " \

		-e ignore \
- 
		tar tvf ${TMPDIR}/test-1.txz
+ 
		tar tvf ${TMPDIR}/test-1.bsd



	mkdir ${TMPDIR}/target

	atf_check \
@@ -121,7 +121,7 @@ EOF
		-e empty \

		-s exit:0 \

		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy \
- 
			${TMPDIR}/test-1.txz
+ 
			${TMPDIR}/test-1.bsd



	atf_check \

		-o match:"^-r-sr-xr-- " \
@@ -153,7 +153,7 @@ EOF
		-o match:"^-r-sr-xr--.*a$" \

		-o match:"^hr-sr-xr--.*a$" \

		-e ignore \
- 
		tar tvf ${TMPDIR}/test-1.txz
+ 
		tar tvf ${TMPDIR}/test-1.bsd



	mkdir ${TMPDIR}/target

	atf_check \
@@ -161,7 +161,7 @@ EOF
		-e empty \

		-s exit:0 \

		pkg -o REPOS_DIR=/dev/null  -r ${TMPDIR}/target install -qfy \
- 
			${TMPDIR}/test-1.txz
+ 
			${TMPDIR}/test-1.bsd



	atf_check \

		-o match:"^-r-sr-xr-- " \
@@ -199,7 +199,7 @@ chflags_body()
		-e empty \

		-s exit:0 \

		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy \
- 
		    ${TMPDIR}/test-1.txz
+ 
		    ${TMPDIR}/test-1.bsd



	atf_check \

		-o match:"nodump" \
@@ -230,7 +230,7 @@ chflags_schg_body()
		-e empty \

		-s exit:0 \

		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy \
- 
			${TMPDIR}/test-1.txz
+ 
			${TMPDIR}/test-1.bsd



	atf_check \

		-o match:"schg" \
@@ -244,7 +244,7 @@ chflags_schg_body()
		-e empty \

		-s exit:0 \

		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy \
- 
			${TMPDIR}/test-1.txz
+ 
			${TMPDIR}/test-1.bsd

}



chflags_schg_cleanup()
@@ -276,5 +276,5 @@ EOF
		-e empty \

		-s exit:0 \

		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy \
- 
			${TMPDIR}/test-1.txz
+ 
			${TMPDIR}/test-1.bsd

}
modified tests/frontend/install.sh
@@ -124,7 +124,7 @@ EOF
	atf_check -o ignore \

		-e inline:"${PROGNAME}: PRE-INSTALL script failed\n" \

		-s exit:3 \
- 
		pkg -o REPOS_DIR="/dev/null" install -y ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR="/dev/null" install -y ${TMPDIR}/test-1.bsd

}



post_script_ignored_body()
@@ -145,5 +145,5 @@ EOF
	atf_check -o ignore \

		-e inline:"${PROGNAME}: POST-INSTALL script failed\n" \

		-s exit:0 \
- 
		pkg -o REPOS_DIR="/dev/null" install -y ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR="/dev/null" install -y ${TMPDIR}/test-1.bsd

}
modified tests/frontend/issue1445.sh
@@ -22,7 +22,7 @@ EOF
	ln -sf ${TMPDIR}/plop2 ${TMPDIR}/plop

	atf_check \

		-o ignore \
- 
		pkg -o REPOS_DIR=/dev/null install -y ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null install -y ${TMPDIR}/test-1.bsd

	test -d ${TMPDIR}/plop || atf_fail "directory not created"

}
@@ -42,6 +42,6 @@ EOF
	ln -sf ${TMPDIR}/plop2 ${TMPDIR}/plop

	atf_check \

		-o ignore \
- 
		pkg -o REPOS_DIR=/dev/null install -y ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null install -y ${TMPDIR}/test-1.bsd

	test -h ${TMPDIR}/plop || atf_fail "Symlink deleted"

}
modified tests/frontend/lua.sh
@@ -41,7 +41,7 @@ EOF
		-o inline:"plop\n" \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd



}
@@ -67,7 +67,7 @@ EOF
		-o inline:"this is post install1\nthis is post install2\n" \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd



}
@@ -94,7 +94,7 @@ EOF
		-o inline:"this is post install1\nthis is post install2\nthis is a message\n" \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd



}
@@ -123,7 +123,7 @@ EOF
	atf_check \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd

	[ -f ${TMPDIR}/target/file.txt ] || atf_fail "File not created in the rootdir"

	# test the mode

	atf_check -o match:"^-rw-r--r--" ls -l ${TMPDIR}/target/file.txt
@@ -157,14 +157,14 @@ EOF
	atf_check \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd

	test -d ${TMPDIR}/target/file && atf_fail "directory not removed"



	touch ${TMPDIR}/target/file

	atf_check \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd

	test -f ${TMPDIR}/target/file && atf_fail "file not removed"

	return 0

}
@@ -191,7 +191,7 @@ EOF
	atf_check \

		-e inline:"${ERR}" \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd

	test -f ${TMPDIR}/target/file && atf_fail "File not renamed"

	test -f ${TMPDIR}/target/plop || atf_fail "File not renamed"

	return 0
@@ -222,7 +222,7 @@ pkg: lua script failed\n"
	atf_check \

		-e inline:"${ERR}" \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd

}



script_upgrade_body() {
@@ -250,7 +250,7 @@ EOF
		-e empty \

		-o empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd



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

	cat << EOF >> test.ucl
@@ -265,7 +265,7 @@ EOS
}

EOF
- 
	rm ${TMPDIR}/test-1.txz
+ 
	rm ${TMPDIR}/test-1.bsd

	atf_check \

		-o empty \

		-e empty \
@@ -323,7 +323,7 @@ EOF
		-o inline:"same\n" \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd



	# Cleanup

	atf_check \
@@ -364,7 +364,7 @@ EOF
		-o inline:"different\n" \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd

}



script_filecmp_symlink_body() {
@@ -403,7 +403,7 @@ EOF
		-o inline:"same\n" \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd



	# Cleanup

	atf_check \
@@ -449,7 +449,7 @@ EOF
		-o inline:"different\n" \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd

}



script_copy_body() {
@@ -478,7 +478,7 @@ EOF
		-o empty \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd



	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/a.sample

	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/a
@@ -517,7 +517,7 @@ EOF
		-o empty \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd



	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/a.sample

	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/b
@@ -569,7 +569,7 @@ EOF
		-o empty \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd



	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/a.sample

	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/a
@@ -617,7 +617,7 @@ EOF
		-o empty \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd



	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/a

	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/b.sample
@@ -664,7 +664,7 @@ EOF
		-o empty \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd



	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/a

	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/b
@@ -711,7 +711,7 @@ EOF
		-o empty \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd



	atf_check \

		-o empty \
@@ -748,5 +748,5 @@ EOF
		-o inline:"zero\nreg\n" \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd

}
modified tests/frontend/query.sh
@@ -126,8 +126,8 @@ EOF
		-s exit:0 \

		pkg create -M test2.ucl
- 
	sum1=$(pkg query -F ./test-1.txz '%X')
- 
	sum2=$(pkg query -F ./test-2.txz '%X')
+ 
	sum1=$(pkg query -F ./test-1.bsd '%X')
+ 
	sum2=$(pkg query -F ./test-2.bsd '%X')



	atf_check \

		-o empty \
@@ -146,35 +146,35 @@ EOF
		-o inline:"${TMPDIR}/plop\n${TMPDIR}/bla\n" \

		-e empty \

		-s exit:0 \
- 
		pkg query -F ./test-1.txz '%Fp'
+ 
		pkg query -F ./test-1.bsd '%Fp'



	atf_check \

		-o inline:"1\n" \

		-e empty \

		-s exit:0 \
- 
		pkg query -F ./test-1.txz '%?F'
+ 
		pkg query -F ./test-1.bsd '%?F'



	atf_check \

		-o inline:"2\n" \

		-e empty \

		-s exit:0 \
- 
		pkg query -F ./test-1.txz '%#F'
+ 
		pkg query -F ./test-1.bsd '%#F'



	atf_check \

		-o inline:"test 1\n" \

		-e empty \

		-s exit:0 \
- 
		pkg query -F ./test-1.txz '%n %v'
+ 
		pkg query -F ./test-1.bsd '%n %v'



	atf_check \

		-o inline:"a test\n" \

		-e empty \

		-s exit:0 \
- 
		pkg query -F ./test-1.txz '%c'
+ 
		pkg query -F ./test-1.bsd '%c'



	atf_check \

		-o inline:"Nothing to see here\n" \

		-e empty \

		-s exit:0 \
- 
		pkg query -F ./plop-1.txz '%c'
+ 
		pkg query -F ./plop-1.bsd '%c'

}
modified tests/frontend/repo.sh
@@ -36,7 +36,7 @@ EOF
		-s exit:0 \

		pkg repo --meta-file meta.ucl .
- 
	cp test-1.txz test.txz
+ 
	cp test-1.bsd test.bsd



	atf_check \

		-o inline:"Creating repository in .:  done\nPacking files for repository:  done\n" \
@@ -48,11 +48,11 @@ EOF
		atf_pass

	fi
- 
	nb=$(tar -xf digests.txz -O digests | wc -l)
+ 
	nb=$(tar -xf digests.bsd -O digests | wc -l)

	atf_check_equal $nb 2



	mkdir Latest
- 
	ln -s test-1.txz Latest/test.txz
+ 
	ln -s test-1.bsd Latest/test.bsd



	atf_check \

		-o inline:"Creating repository in .:  done\nPacking files for repository:  done\n" \
@@ -86,7 +86,7 @@ EOF
		-s exit:0 \

		pkg repo --meta-file meta.ucl .
- 
	ln -s test-1.txz test.txz
+ 
	ln -s test-1.bsd test.bsd



	atf_check \

		-o inline:"Creating repository in .:  done\nPacking files for repository:  done\n" \
@@ -98,10 +98,10 @@ EOF
		atf_pass

	fi
- 
	atf_check -s exit:127 -o ignore -e ignore "ls digest.txz"
+ 
	atf_check -s exit:127 -o ignore -e ignore "ls digest.bsd"



	mkdir Latest
- 
	ln -s test-1.txz Latest/test.txz
+ 
	ln -s test-1.bsd Latest/test.bsd



	atf_check \

		-o inline:"Creating repository in .:  done\nPacking files for repository:  done\n" \
@@ -188,7 +188,7 @@ repo_symlinks_body() {
	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1.0 "${TMPDIR}"

	atf_check pkg create --format txz -M test.ucl

	mkdir repo
- 
	ln -sf ../test-1.0.txz ./repo/meh-1.0.txz
+ 
	ln -sf ../test-1.0.bsd ./repo/meh-1.0.bsd

	atf_check -o ignore pkg repo repo

	cat > pkg.conf << EOF

PKG_DBDIR=${TMPDIR}
@@ -205,8 +205,8 @@ EOF


	rm -rf repo

	mkdir repo
- 
	cp test-1.0.txz repo/
- 
	ln -fs test-1.0.txz ./repo/meh-1.0.txz
+ 
	cp test-1.0.bsd repo/
+ 
	ln -fs test-1.0.bsd ./repo/meh-1.0.bsd



	atf_check -o ignore pkg repo repo

	atf_check -o ignore \
modified tests/frontend/shellscript.sh
@@ -30,7 +30,7 @@ EOF
		-o inline:"this is post install1\nthis is post install2\n" \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd



}
@@ -58,7 +58,7 @@ EOF
		-o inline:"this is post install1\nthis is post install2\nthis is a message\n" \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd



}
@@ -87,7 +87,7 @@ EOF
		-o inline:"this is post install1\nthis is post install2\nthis is a message\n" \

		-e empty \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd



}
@@ -114,7 +114,7 @@ EOF
		-e empty \

		-o ignore \

		-s exit:0 \
- 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd



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

	cat << EOF >> test.ucl
@@ -127,7 +127,7 @@ EOS
}

EOF
- 
	rm ${TMPDIR}/test-1.txz
+ 
	rm ${TMPDIR}/test-1.bsd

	atf_check \

		-o empty \

		-e empty \
@@ -138,7 +138,7 @@ EOF
		-o ignore \

		-e empty \

		-s exit:0 \
- 
		pkg info -R -F ./test-2.txz
+ 
		pkg info -R -F ./test-2.bsd

	atf_check \

		-o ignore \

		-e empty \
modified tests/frontend/triggers.sh
@@ -27,8 +27,8 @@ EOF
	echo trigger_dir/trigger.ucl > plist

	atf_check pkg create -M test.ucl -p plist -r .

	mkdir target
- 
	atf_check pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
- 
	atf_check pkg -o REPOS_DIR=/dev/null -o PKG_TRIGGERS_DIR="/trigger_dir" -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
	atf_check pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
+ 
	atf_check pkg -o REPOS_DIR=/dev/null -o PKG_TRIGGERS_DIR="/trigger_dir" -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd

	atf_check -o inline:"Cleaning up\n" pkg -o REPOS_DIR=/dev/null -o PKG_TRIGGERS_DIR="/trigger_dir" -r ${TMPDIR}/target delete -qy test

}
@@ -53,7 +53,7 @@ EOF
	echo trigger_dir/trigger.ucl > plist

	atf_check pkg create -M test.ucl -p plist -r .

	mkdir target
- 
	atf_check pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
- 
	atf_check pkg -o REPOS_DIR=/dev/null -o PKG_TRIGGERS_DIR="/trigger_dir" -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.txz
+ 
	atf_check pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
+ 
	atf_check pkg -o REPOS_DIR=/dev/null -o PKG_TRIGGERS_DIR="/trigger_dir" -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd

	atf_check -o inline:"Cleaning up\n" pkg -o REPOS_DIR=/dev/null -o PKG_TRIGGERS_DIR="/trigger_dir" -r ${TMPDIR}/target delete -qy test

}
modified tests/frontend/vital.sh
@@ -22,7 +22,7 @@ EOF
		-o match:"^vital" \

		-e empty \

		-s exit:0 \
- 
		pkg info -R --raw-format ucl -F ${TMPDIR}/test-1.txz
+ 
		pkg info -R --raw-format ucl -F ${TMPDIR}/test-1.bsd



	mkdir ${TMPDIR}/target

	atf_check \
@@ -30,7 +30,7 @@ EOF
		-e empty \

		-s exit:0 \

		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy \
- 
			${TMPDIR}/test-1.txz
+ 
			${TMPDIR}/test-1.bsd



	atf_check \

		-o inline:"1\n" \