Commit 4b08536d authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Reduce reliance on external cmds by removing 'cat'

parent df64ada8

bootstrap-stage.bash

+5 −6
Original line number Diff line number Diff line
@@ -57,12 +57,11 @@ done 


# nsswitch (if present, only on GNU libc platforms)

mkdir -p $STAGE/etc

collect-binaries /lib/*/libnss* &&

	cat <<-END_CONF >$STAGE/etc/nsswitch.conf

		passwd: files

		group:  files

		hosts:  files dns

	END_CONF

if collect-binaries /lib/*/libnss*; then

	echo "passwd: files"

	echo "group:  files"

	echo "hosts:  files dns"

fi >$STAGE/etc/nsswitch.conf



# Temp directories

mkdir -p --mode=1777 $STAGE/var/tmp

collect-binaries.bash

+4 −4
Original line number Diff line number Diff line
@@ -119,10 +119,10 @@ if [[ ${#TARGETS[*]} -gt 0 ]]; then 
		copy "$target"

	done

else

	[[ -t 0 ]] && cat <<-END_TXT >&2

		No files specified in arguments; are you sure you meant to do that?

		Reading files list from terminal input:

	END_TXT

	if [[ -t 0 ]]; then

		echo "No files specified in arguments; are you sure you meant to do that?"

		echo "Reading files list from terminal input:"

	fi >&2

	while read target; do

		copy "$target"

	done