This commit is contained in:
Héctor Molinero Fernández 2021-01-04 01:21:46 +01:00
commit 755993f95d
8 changed files with 8 additions and 8 deletions

2
hblock
View file

@ -425,7 +425,7 @@ main() {
# Create a temporary work directory. # Create a temporary work directory.
tmpWorkDir="$(createTempDir)" tmpWorkDir="$(createTempDir)"
# shellcheck disable=SC2154 # shellcheck disable=SC2154
trap 'ret=$?; rm -rf -- "${tmpWorkDir:?}"; trap - EXIT; exit "${ret:?}"' EXIT TERM INT HUP trap 'ret="$?"; rm -rf -- "${tmpWorkDir:?}"; trap - EXIT; exit "${ret:?}"' EXIT TERM INT HUP
# Check the header file. # Check the header file.
case "${headerFile:?}" in case "${headerFile:?}" in

View file

@ -14,7 +14,7 @@ main() {
mkdir -p -- "${target:?}.tmp" mkdir -p -- "${target:?}.tmp"
# shellcheck disable=SC2154 # shellcheck disable=SC2154
trap 'ret=$?; rm -rf -- "${target:?}.tmp"; trap - EXIT; exit "${ret:?}"' EXIT TERM INT HUP trap 'ret="$?"; rm -rf -- "${target:?}.tmp"; trap - EXIT; exit "${ret:?}"' EXIT TERM INT HUP
# shellcheck disable=SC2155 # shellcheck disable=SC2155
export HBLOCK_HEADER="$(cat <<-'EOF' export HBLOCK_HEADER="$(cat <<-'EOF'

View file

@ -16,7 +16,7 @@ main() {
buildDir="$(mktemp -d)" buildDir="$(mktemp -d)"
# shellcheck disable=SC2154 # shellcheck disable=SC2154
trap 'ret=$?; rm -rf -- "${buildDir:?}"; trap - EXIT; exit "${ret:?}"' EXIT TERM INT HUP trap 'ret="$?"; rm -rf -- "${buildDir:?}"; trap - EXIT; exit "${ret:?}"' EXIT TERM INT HUP
# Copy the assets directory to the build directory. # Copy the assets directory to the build directory.
rsync -a -- "${assetsDir:?}"/ "${buildDir:?}"/ rsync -a -- "${assetsDir:?}"/ "${buildDir:?}"/

View file

@ -16,7 +16,7 @@ main() {
buildDir="$(mktemp -d)" buildDir="$(mktemp -d)"
# shellcheck disable=SC2154 # shellcheck disable=SC2154
trap 'ret=$?; rm -rf -- "${buildDir:?}"; trap - EXIT; exit "${ret:?}"' EXIT TERM INT HUP trap 'ret="$?"; rm -rf -- "${buildDir:?}"; trap - EXIT; exit "${ret:?}"' EXIT TERM INT HUP
# Copy the assets directory to the build directory. # Copy the assets directory to the build directory.
rsync -a -- "${assetsDir:?}"/ "${buildDir:?}"/ rsync -a -- "${assetsDir:?}"/ "${buildDir:?}"/

View file

@ -16,7 +16,7 @@ main() {
buildDir="$(mktemp -d)" buildDir="$(mktemp -d)"
# shellcheck disable=SC2154 # shellcheck disable=SC2154
trap 'ret=$?; rm -rf -- "${buildDir:?}"; trap - EXIT; exit "${ret:?}"' EXIT TERM INT HUP trap 'ret="$?"; rm -rf -- "${buildDir:?}"; trap - EXIT; exit "${ret:?}"' EXIT TERM INT HUP
# Copy the assets directory to the build directory. # Copy the assets directory to the build directory.
rsync -a -- "${assetsDir:?}"/ "${buildDir:?}"/ rsync -a -- "${assetsDir:?}"/ "${buildDir:?}"/

View file

@ -16,7 +16,7 @@ main() {
buildDir="$(mktemp -d)" buildDir="$(mktemp -d)"
# shellcheck disable=SC2154 # shellcheck disable=SC2154
trap 'ret=$?; rm -rf -- "${buildDir:?}"; trap - EXIT; exit "${ret:?}"' EXIT TERM INT HUP trap 'ret="$?"; rm -rf -- "${buildDir:?}"; trap - EXIT; exit "${ret:?}"' EXIT TERM INT HUP
# Copy the assets directory to the build directory. # Copy the assets directory to the build directory.
rsync -a -- "${assetsDir:?}"/ "${buildDir:?}"/ rsync -a -- "${assetsDir:?}"/ "${buildDir:?}"/

View file

@ -16,7 +16,7 @@ main() {
buildDir="$(mktemp -d)" buildDir="$(mktemp -d)"
# shellcheck disable=SC2154 # shellcheck disable=SC2154
trap 'ret=$?; rm -rf -- "${buildDir:?}"; trap - EXIT; exit "${ret:?}"' EXIT TERM INT HUP trap 'ret="$?"; rm -rf -- "${buildDir:?}"; trap - EXIT; exit "${ret:?}"' EXIT TERM INT HUP
# Copy the assets directory to the build directory. # Copy the assets directory to the build directory.
rsync -a -- "${assetsDir:?}"/ "${buildDir:?}"/ rsync -a -- "${assetsDir:?}"/ "${buildDir:?}"/

View file

@ -63,7 +63,7 @@ main() {
# Create a temporary work directory. # Create a temporary work directory.
tmpWorkDir="$(createTempDir)" tmpWorkDir="$(createTempDir)"
# shellcheck disable=SC2154 # shellcheck disable=SC2154
trap 'ret=$?; rm -rf -- "${tmpWorkDir:?}"; trap - EXIT; exit "${ret:?}"' EXIT TERM INT HUP trap 'ret="$?"; rm -rf -- "${tmpWorkDir:?}"; trap - EXIT; exit "${ret:?}"' EXIT TERM INT HUP
# Copy domains file. # Copy domains file.
domainsFileTmp="${tmpWorkDir:?}/domains.list" domainsFileTmp="${tmpWorkDir:?}/domains.list"