Skip to content

Commit

Permalink
chore(shellcheck): Fix issue in slim-java.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
@grzesuav
grzesuav committed Feb 26, 2020
1 parent bc89d49 commit a954643
Show file tree
Hide file tree
Showing 27 changed files with 28 additions and 27 deletions.
2 changes: 1 addition & 1 deletion 10/jdk/alpine/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 10/jdk/ubuntu/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/alpine/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/centos/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/clefos/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/debian/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/ubi/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/ubuntu/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 12/jdk/alpine/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 12/jdk/debian/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 12/jdk/ubuntu/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 13/jdk/alpine/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 13/jdk/centos/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 13/jdk/clefos/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 13/jdk/debian/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 13/jdk/ubi/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 13/jdk/ubuntu/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 8/jdk/alpine/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 8/jdk/centos/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 8/jdk/clefos/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 8/jdk/debian/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 8/jdk/ubi/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 8/jdk/ubuntu/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 9/jdk/alpine/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
2 changes: 1 addition & 1 deletion 9/jdk/ubuntu/slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down
3 changes: 2 additions & 1 deletion build_latest.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ function build_image() {
echo "#####################################################"
echo "INFO: docker build --no-cache ${tags} -f ${dockerfile} ."
echo "#####################################################"
if ! docker build --pull --no-cache "${tags}" -f "${dockerfile}" . ; then
# shellcheck disable=SC2086 # ignoring ${tags} due to whitespace problem
if ! docker build --pull --no-cache ${tags} -f "${dockerfile}" . ; then
echo "ERROR: Docker build of image: ${tags} from ${dockerfile} failed."
exit 1
fi
Expand Down
2 changes: 1 addition & 1 deletion slim-java.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function jre_lib_files() {
# Derive arch from current platorm.
lib_arch_dir=$(parse_platform_specific)
if [ -d "${lib_arch_dir}" ]; then
pushd "${lib_arch_dir}" >/dev/null
pushd "${lib_arch_dir}" >/dev/null || return
rm -rf classic/ libdeploy.so libjavaplugin_* libjsoundalsa.so libnpjp2.so libsplashscreen.so
# Only remove the default dir for 64bit versions
if [ "${proc_type}" == "64bit" ]; then
Expand Down

0 comments on commit a954643

Please sign in to comment.