diff options
Diffstat (limited to 'resources/scripts/helpers/build/release')
| -rwxr-xr-x | resources/scripts/helpers/build/release/docs | 4 | ||||
| -rwxr-xr-x | resources/scripts/helpers/build/release/roms | 2 | ||||
| -rwxr-xr-x | resources/scripts/helpers/build/release/sha512sums | 2 | ||||
| -rwxr-xr-x | resources/scripts/helpers/build/release/src | 5 | ||||
| -rwxr-xr-x | resources/scripts/helpers/build/release/tobuild | 4 | ||||
| -rwxr-xr-x | resources/scripts/helpers/build/release/util | 10 |
6 files changed, 12 insertions, 15 deletions
diff --git a/resources/scripts/helpers/build/release/docs b/resources/scripts/helpers/build/release/docs index 38a0999..54faac5 100755 --- a/resources/scripts/helpers/build/release/docs +++ b/resources/scripts/helpers/build/release/docs @@ -40,7 +40,7 @@ distdir="${versiondir}/${distname}" printf 'Deleting old documentation release archives\n' rm -f "${distdir}.tar.xz" -rm -Rf "${distdir}/" +rm -Rf "${distdir:?}/" mkdir -p "${distdir}/" cp -r docs/* "${distdir}/" @@ -50,6 +50,6 @@ printf '%s\n' "${version}" >"${distdir}/version" printf 'Creating compressed documentation archive at %s\n' "${distdir}.tar.xz" (cd "${versiondir}/" && tar -c "${distname}/" | xz -9e >"${distname}.tar.xz") -rm -Rf "${distdir}/" +rm -Rf "${distdir:?}/" printf 'Documentation release archive is stored in %s/\n' "${versiondir}" diff --git a/resources/scripts/helpers/build/release/roms b/resources/scripts/helpers/build/release/roms index 14c05ad..c6c5c5c 100755 --- a/resources/scripts/helpers/build/release/roms +++ b/resources/scripts/helpers/build/release/roms @@ -66,7 +66,7 @@ for payload in *; do # Create the compressed archive. tar -c "${archivename}/" | xz -9e >"../../${romdir}/${payload}/${archivename}.tar.xz" - rm -Rf "${archivename}/" + rm -Rf "${archivename:?}/" printf ' OK\n' diff --git a/resources/scripts/helpers/build/release/sha512sums b/resources/scripts/helpers/build/release/sha512sums index ab14ca4..456764b 100755 --- a/resources/scripts/helpers/build/release/sha512sums +++ b/resources/scripts/helpers/build/release/sha512sums @@ -45,7 +45,7 @@ rm -f "${sha512filepath}" # create sha512sum file printf "Creating list of SHA512 sums in %s...\n" "${sha512filepath}" -(cd "${versiondir}/" && for file in $(find -type f); do sha512sum $file >> "${sha512filename}"; done) +(cd "${versiondir}/" && for file in $(find -type f); do sha512sum "${file}" >> "${sha512filename}"; done) printf "...done.\n" printf "\n" diff --git a/resources/scripts/helpers/build/release/src b/resources/scripts/helpers/build/release/src index 60356e8..6d9f666 100755 --- a/resources/scripts/helpers/build/release/src +++ b/resources/scripts/helpers/build/release/src @@ -38,7 +38,7 @@ distdir="${versiondir}/${distname}" printf 'Deleting old source release archives\n' rm -f "${distdir}.tar.xz" -rm -Rf "${distdir}/" +rm -Rf "${distdir:?}/" mkdir -p "${distdir}/" @@ -77,7 +77,6 @@ rm -Rf "${distdir}/resources/utilities/coreboot-libre/" # in the src release archive rm -f "${distdir}/download" rm -Rf "${distdir}/resources/scripts/helpers/download/" -rm -Rf "${distdir}/resources/scripts/helpers/sha512sums/" # The release archive for _src does not include docs, so it # is nonsense to include the script for it there @@ -102,6 +101,6 @@ rm -f "${distdir}/resources/utilities/grub-assemble/grub_vesafb.elf" printf 'Creating %s.tar.xz\n' "${distdir}" (cd "${versiondir}/" && tar -c "${distname}/" | xz -9e >"${distname}.tar.xz") -rm -Rf "${distdir}/" +rm -Rf "${distdir:?}/" printf 'Source release archive is stored in %s/\n' "${versiondir}" diff --git a/resources/scripts/helpers/build/release/tobuild b/resources/scripts/helpers/build/release/tobuild index 7360fb1..ad8bac9 100755 --- a/resources/scripts/helpers/build/release/tobuild +++ b/resources/scripts/helpers/build/release/tobuild @@ -37,7 +37,7 @@ distdir="${versiondir}/${distname}" printf "Creating source archive for flashrom and bucts\n" # delete the old data -rm -Rf "${distdir}/" +rm -Rf "${distdir:?}/" rm -f "${distdir}.tar.xz" # this is where they will go @@ -75,7 +75,7 @@ printf '%s\n' "${version}" >"${distdir}/version" (cd "${versiondir}/" && tar -c "${distname}/" | xz -9e >"${distname}.tar.xz") # and delete the directory -rm -Rf "${distdir}/" +rm -Rf "${distdir:?}/" printf "\n" printf "Tar archive created: %s\n" "${distdir}.tar.xz" diff --git a/resources/scripts/helpers/build/release/util b/resources/scripts/helpers/build/release/util index 5ef733e..95bc234 100755 --- a/resources/scripts/helpers/build/release/util +++ b/resources/scripts/helpers/build/release/util @@ -26,12 +26,12 @@ set -u -e arch="unknown" -if [ $(uname -i) = "i686" ] || [ $(uname -m) = "i686" ] +if [ "$(uname -i)" = "i686" ] || [ "$(uname -m)" = "i686" ] then arch="i686" echo "Running on i686. ok." sleep 2 -elif [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ] +elif [ "$(uname -i)" = "x86_64" ] || [ "$(uname -m)" = "x86_64" ] then arch="x86_64" echo "Running on x86_64. ok." @@ -55,7 +55,7 @@ distdir="${versiondir}/${distname}" printf "Creating utility archive (static executables)\n" # delete the old data -rm -Rf "${distdir}/" +rm -Rf "${distdir:?}/" rm -f "${distdir}.tar.xz" # this is where they will go @@ -221,6 +221,4 @@ printf "done\n\n" # ---------------------------------------------------------------------------------------------------------------------------- # The uncompressed archives are no longer needed -rm -Rf "${distdir}/" - -# ------------------- DONE ---------------------- +rm -Rf "${distdir:?}/" |