Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-04-10 07:42:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix error in shellcheck N3

Browse Source 
Fix error in shellcheck N3

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
Bensuperpc 2021-07-29 09:07:11 +02:00
parent 4d2bf9be44
commit 317b741420
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
imagefiles/build-and-install-cmake.sh
View File

@ -69,7 +69,7 @@ file(
list(GET status 0 error_code) list(GET status 0 error_code)
list(GET status 1 error_msg) list(GET status 1 error_msg)
if(error_code) if(error_code)
message(FATAL_ERROR "error: Failed to download ${url} - ${error_msg}") message(FATAL_ERROR "error: Failed to download \${url} - \${error_msg}")
else() else()
message(STATUS "CMake: HTTPS download works") message(STATUS "CMake: HTTPS download works")
endif() endif()

6
imagefiles/build-and-install-openssl.sh
View File

@ -59,7 +59,7 @@ PERL_DOWNLOAD_URL=https://www.cpan.org/src/5.0
function do_perl_build { function do_perl_build {
"${WRAPPER}" sh Configure -des -Dprefix=/opt/perl > /dev/null "${WRAPPER}" sh Configure -des -Dprefix=/opt/perl > /dev/null
"${WRAPPER}" make -j$(nproc) > /dev/null "${WRAPPER}" make -j"$(nproc)" > /dev/null
"${WRAPPER}" make install > /dev/null "${WRAPPER}" make install > /dev/null
} }
@ -72,13 +72,13 @@ function build_perl {
curl -fsSLO "${PERL_DOWNLOAD_URL}/${perl_fname}.tar.gz" curl -fsSLO "${PERL_DOWNLOAD_URL}/${perl_fname}.tar.gz"
check_sha256sum "${perl_fname}.tar.gz" "${perl_sha256}" check_sha256sum "${perl_fname}.tar.gz" "${perl_sha256}"
tar -xzf "${perl_fname}.tar.gz" tar -xzf "${perl_fname}.tar.gz"
(cd $"{perl_fname}" && do_perl_build) (cd "${perl_fname}" && do_perl_build)
rm -rf "${perl_fname}" "${perl_fname}.tar.gz" rm -rf "${perl_fname}" "${perl_fname}.tar.gz"
} }
function do_openssl_build { function do_openssl_build {
"${WRAPPER}" ./config no-shared -fPIC "$CONFIG_FLAG" --prefix=/usr/local/ssl --openssldir=/usr/local/ssl > /dev/null "${WRAPPER}" ./config no-shared -fPIC "$CONFIG_FLAG" --prefix=/usr/local/ssl --openssldir=/usr/local/ssl > /dev/null
"${WRAPPER}" make -j$(nproc) > /dev/null "${WRAPPER}" make -j"$(nproc)" > /dev/null
"${WRAPPER}" make install_sw > /dev/null "${WRAPPER}" make install_sw > /dev/null
} }

4
imagefiles/dockcross
View File

@ -133,7 +133,7 @@ while [[ $# != 0 ]]; do
;; ;;
-*) -*)
err Unknown option \"$1\" err Unknown option \"$1\"
command:help command:help $1
exit exit
;; ;;
@ -152,7 +152,7 @@ done
# Source the config file if it exists # Source the config file if it exists
DEFAULT_DOCKCROSS_CONFIG=~/.dockcross DEFAULT_DOCKCROSS_CONFIG=~/.dockcross
FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}} FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}}
# shellcheck source=~/.dockcross
[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG" [[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG"
# Set the docker image # Set the docker image

3
imagefiles/install-gosu-binary.sh
View File

@ -19,7 +19,8 @@ url="https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${dpk
url_key="https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${dpkgArch}.asc" url_key="https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${dpkgArch}.asc"
# download and verify the signature # download and verify the signature
export GNUPGHOME="$(mktemp -d)" GNUPGHOME=$(mktemp -d)
export $GNUPGHOME
gpg --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ gpg --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
gpg --keyserver hkp://pgp.key-server.io:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \ gpg --keyserver hkp://pgp.key-server.io:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \