diff options
| author | Leah Rowe <vimuser@noreply.codeberg.org> | 2023-09-03 14:12:47 +0000 | 
|---|---|---|
| committer | Leah Rowe <vimuser@noreply.codeberg.org> | 2023-09-03 14:12:47 +0000 | 
| commit | 71d361aac7ce790268a5f3454140f23889a56e7d (patch) | |
| tree | 56a4c321f5ef1eefadc6bfac4275e47f8468ac40 | |
| parent | eebf713311ca333f85d75fafb92fdbd729b4a0ba (diff) | |
| parent | ef3fb05d66f1b5c94dd65ae2d14b691227d6afbe (diff) | |
Merge pull request 'Less cat abuse' (#123) from Riku_V/lbmk:cat into master
Reviewed-on: https://codeberg.org/libreboot/lbmk/pulls/123
| -rwxr-xr-x | checkgit | 2 | ||||
| -rwxr-xr-x | lbmk | 2 | ||||
| -rwxr-xr-x | script/build/boot/roms | 2 | ||||
| -rwxr-xr-x | script/build/boot/roms_helper | 2 | ||||
| -rwxr-xr-x | script/build/release/roms | 6 | ||||
| -rwxr-xr-x | script/build/release/src | 6 | ||||
| -rwxr-xr-x | script/handle/make/config | 8 | ||||
| -rwxr-xr-x | script/misc/versioncheck | 6 | 
8 files changed, 17 insertions, 17 deletions
| @@ -4,7 +4,7 @@  . "include/err.sh" -projectname="$(cat projectname)" +read projectname < projectname  main()  { @@ -27,7 +27,7 @@ set -u -e  . "include/err.sh"  . "include/export.sh" -projectname="$(cat projectname)" +read projectname < projectname  buildpath=""  mode=""  option="" diff --git a/script/build/boot/roms b/script/build/boot/roms index a19d9445..50b1f460 100755 --- a/script/build/boot/roms +++ b/script/build/boot/roms @@ -31,7 +31,7 @@ set -u -e  . "include/err.sh" -projectname="$(cat projectname)" +read projectname < projectname  opts=""  boards=  firstoption="" diff --git a/script/build/boot/roms_helper b/script/build/boot/roms_helper index 93574d9e..b663dc8e 100755 --- a/script/build/boot/roms_helper +++ b/script/build/boot/roms_helper @@ -28,7 +28,7 @@ set -u -e  . "include/err.sh" -projectname="$(cat projectname)" +read projectname < projectname  cfgsdir="resources/coreboot" diff --git a/script/build/release/roms b/script/build/release/roms index c86fc79f..1d6bcb76 100755 --- a/script/build/release/roms +++ b/script/build/release/roms @@ -23,7 +23,7 @@ set -u -e  . "include/err.sh" -projectname="$(cat projectname)" +read projectname < projectname  version="version-unknown"  versiondate="version-date-unknown"  tree="default" @@ -53,9 +53,9 @@ main()  init_check()  {  	[ -f version ] && \ -		version="$(cat version)" +		read version < version  	[ -f versiondate ] && \ -		versiondate="$(cat versiondate)" +		read versiondate < versiondate  	[ ! -d "bin/" ] && \  		err "init_check: no ROMs built yet (error)"  	[ -d "release/" ] || \ diff --git a/script/build/release/src b/script/build/release/src index b2d3b535..0a0501a3 100755 --- a/script/build/release/src +++ b/script/build/release/src @@ -23,7 +23,7 @@ set -u -e  . "include/err.sh" -projectname="$(cat projectname)" +read projectname < projectname  trees_fetch_list="coreboot u-boot seabios"  simple_fetch_list="flashrom grub memtest86plus me_cleaner uefitool" @@ -46,9 +46,9 @@ printf "Building source code archive, version %s\n" "${version}"  main()  {  	[ -f version ] && \ -		version="$(cat version)" +		read version < version  	[ -f versiondate ] && \ -		versiondate="$(cat versiondate)" +		read versiondate < versiondate  	create_release_directory  	download_modules diff --git a/script/handle/make/config b/script/handle/make/config index c148ebca..3db91550 100755 --- a/script/handle/make/config +++ b/script/handle/make/config @@ -26,8 +26,8 @@ set -u -e  . "include/err.sh" -projectname="$(cat projectname)" -our_version="$(cat version)" +read projectname < projectname +read our_version < version  export LOCALVERSION="-${projectname}-${our_version}" @@ -270,11 +270,11 @@ copy_elf()  		    err "copy_elf: cannot prepare coreboot image"  	fi -	for f in $(cat "${listfile}"); do +	while read f; do  		[ ! -f "${codedir}/$f" ] || \  		    cp "${codedir}/${f}" "${dest_dir}/" || \  		    fail "copy_elf: cannot copy elf file" -	done +	done < ${listfile}  	./handle make file -c "${codedir}" || \  	    fail "copy_elf: clean: ${codedir} (${project}/${target})" diff --git a/script/misc/versioncheck b/script/misc/versioncheck index 73fbb140..6ee683ee 100755 --- a/script/misc/versioncheck +++ b/script/misc/versioncheck @@ -21,10 +21,10 @@ set -u  . "include/err.sh" -project="$(cat projectname)" +read project < projectname  version="version-unknown" -[ -f version ] && version="$(cat version)" +[ -f version ] && read version < version  version_="${version}"  if [ -e ".git" ]; then  	version="$(git describe --tags HEAD 2>&1)" || \ @@ -34,7 +34,7 @@ if [ -e ".git" ]; then  fi  versiondate="version-date-unknown" -[ -f versiondate ] && versiondate="$(cat versiondate)" +[ -f versiondate ] && read versiondate < versiondate  versiondate_="${versiondate}"  if [ -e ".git" ]; then  	versiondate="$(git show --no-patch --no-notes --pretty='%ct' HEAD)" || \ | 
