From 864919d6f195d573e64fa92db08b5a198def3622 Mon Sep 17 00:00:00 2001 From: zlice Date: Mon, 30 Jan 2023 09:34:51 -0500 Subject: [PATCH] common: cleanup trailing whitespaces --- common/build-helper/gir.sh | 6 +++--- common/build-helper/rust.sh | 4 ++-- common/build-style/configure.sh | 2 +- common/build-style/gem.sh | 2 +- common/build-style/gemspec.sh | 2 +- common/build-style/gnu-configure.sh | 2 +- common/build-style/gnu-makefile.sh | 2 +- common/build-style/slashpackage.sh | 2 +- common/chroot-style/ethereal.sh | 4 ++-- common/environment/configure/autoconf_cache/aarch64-linux | 4 ++-- common/environment/configure/autoconf_cache/arm-common | 2 +- common/environment/configure/autoconf_cache/ix86-common | 2 +- common/travis/xlint.sh | 2 +- common/xbps-src/shutils/consistency_check.sh | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/common/build-helper/gir.sh b/common/build-helper/gir.sh index 0091fb31ad93..70699adb1797 100644 --- a/common/build-helper/gir.sh +++ b/common/build-helper/gir.sh @@ -3,7 +3,7 @@ # # This build-helper is used for packages that make use of # the GObject introspection middleware layer. -# +# # Check if the 'gir' build_option is set or if there is no # 'gir' build_option. @@ -13,12 +13,12 @@ if [ "$build_option_gir" ] || [[ $build_options != *"gir"* ]]; then # and its wrappers. hostmakedepends+=" gobject-introspection" fi - + if [ "$CROSS_BUILD" ]; then # Required for running binaries produced from g-ir-compiler # via g-ir-scanner-qemuwrapper hostmakedepends+=" qemu-user-static" - + # Required for running the g-ir-scanner-lddwrapper hostmakedepends+=" prelink-cross" diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh index 272d03f52607..9e604929ed23 100644 --- a/common/build-helper/rust.sh +++ b/common/build-helper/rust.sh @@ -12,7 +12,7 @@ if [ "$CROSS_BUILD" ]; then _XBPS_CROSS_RUST_TARGET_ENV="${_XBPS_CROSS_RUST_TARGET_ENV//-/_}" export CARGO_TARGET_${_XBPS_CROSS_RUST_TARGET_ENV}_LINKER="$CC" unset _XBPS_CROSS_RUST_TARGET_ENV - + # Define equivalent of TOML config in environment # [build] # target = ${RUST_TARGET} @@ -39,7 +39,7 @@ export GETTEXT_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib/gettext" export GETTEXT_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include" # libssh2-sys -export LIBSSH2_SYS_USE_PKG_CONFIG=1 +export LIBSSH2_SYS_USE_PKG_CONFIG=1 # sodium-sys export SODIUM_LIB_DIR="${XBPS_CROSS_BASE}/usr/include" diff --git a/common/build-style/configure.sh b/common/build-style/configure.sh index 7a6d136f4cc6..8fe327507d9e 100644 --- a/common/build-style/configure.sh +++ b/common/build-style/configure.sh @@ -15,7 +15,7 @@ do_build() { } do_check() { - if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then + if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then if make -q check 2>/dev/null; then : else diff --git a/common/build-style/gem.sh b/common/build-style/gem.sh index 150c5b30d338..779e94eec353 100644 --- a/common/build-style/gem.sh +++ b/common/build-style/gem.sh @@ -5,7 +5,7 @@ do_install() { : ${gem_cmd:=gem} local _GEMDIR _INSTDIR - + _GEMDIR=$($gem_cmd env gemdir) _INSTDIR=${DESTDIR}/${_GEMDIR}/gems/${pkgname#ruby-}-${version} diff --git a/common/build-style/gemspec.sh b/common/build-style/gemspec.sh index b47ef7b1bc6b..9568e819ed45 100644 --- a/common/build-style/gemspec.sh +++ b/common/build-style/gemspec.sh @@ -173,7 +173,7 @@ do_install() { if [ "$CROSS_BUILD" ]; then local _TARGET_PLATFORM _TARGET_EXT_DIR - + # Get arch of the target and host platform by reading the rbconfig.rb # of the cross ruby _TARGET_PLATFORM="$(ruby -r \ diff --git a/common/build-style/gnu-configure.sh b/common/build-style/gnu-configure.sh index 4326d07d75cc..82d36f6ee0f7 100644 --- a/common/build-style/gnu-configure.sh +++ b/common/build-style/gnu-configure.sh @@ -16,7 +16,7 @@ do_build() { } do_check() { - if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then + if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then if make -q check 2>/dev/null; then : else diff --git a/common/build-style/gnu-makefile.sh b/common/build-style/gnu-makefile.sh index f81ef4e21db4..c4f4f780f9f6 100644 --- a/common/build-style/gnu-makefile.sh +++ b/common/build-style/gnu-makefile.sh @@ -18,7 +18,7 @@ do_build() { } do_check() { - if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then + if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then if make -q check 2>/dev/null; then : else diff --git a/common/build-style/slashpackage.sh b/common/build-style/slashpackage.sh index 5f4fe4fb93fd..59e82732f7a8 100644 --- a/common/build-style/slashpackage.sh +++ b/common/build-style/slashpackage.sh @@ -7,7 +7,7 @@ # build_style=slashpackage # build_wrksrc=${pkgname}-${version} # distfiles= -# +# # example (daemontools) # # Template file for 'daemontools' diff --git a/common/chroot-style/ethereal.sh b/common/chroot-style/ethereal.sh index cf6e4dc244f9..a226465cc82f 100755 --- a/common/chroot-style/ethereal.sh +++ b/common/chroot-style/ethereal.sh @@ -12,7 +12,7 @@ # into /.xbps_chroot_init # # The supported way to make use of thie chroot-style is to create -# a root filesystem that has base-chroot and git installed and +# a root filesystem that has base-chroot and git installed and # have it inside a container engine like Docker. # # Docker example: @@ -21,7 +21,7 @@ # -R http://mirrors.servercentral.com/voidlinux/current \ # -S base-chroot # $ tar -pC /tmp/image -c . | sudo docker import - voidlinux/masterdir -# $ rm -rf /tmp/image +# $ rm -rf /tmp/image # # docker run --rm -it \ # -e XBPS_CHROOT_CMD=ethereal \ # -e XBPS_ALLOW_CHROOT_BREAKOUT=yes \ diff --git a/common/environment/configure/autoconf_cache/aarch64-linux b/common/environment/configure/autoconf_cache/aarch64-linux index ad17545c098e..4367f917bf56 100644 --- a/common/environment/configure/autoconf_cache/aarch64-linux +++ b/common/environment/configure/autoconf_cache/aarch64-linux @@ -81,10 +81,10 @@ libIDL_cv_long_long_format=ll ## ac_cv_alignof_CORBA_short=2 ## ac_cv_alignof_CORBA_struct=1 ## ac_cv_alignof_CORBA_wchar=2 -## +## ## lf_cv_sane_realloc=yes as_cv_unaligned_access=${as_cv_unaligned_access=no} -## +## ## #unfs3 ## nfsd_cv_broken_setfsuid=${nfsd_cv_broken_setfsuid=0} ## nfsd_cv_func_statfs=${nfsd_cv_func_statfs=statfs2_bsize} diff --git a/common/environment/configure/autoconf_cache/arm-common b/common/environment/configure/autoconf_cache/arm-common index 0f09e06671e1..3526b775039d 100644 --- a/common/environment/configure/autoconf_cache/arm-common +++ b/common/environment/configure/autoconf_cache/arm-common @@ -99,7 +99,7 @@ acx_working_snprintf=${acx_working_snprintf=yes} # libidl libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll} -# libnet +# libnet ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes} # libpcap diff --git a/common/environment/configure/autoconf_cache/ix86-common b/common/environment/configure/autoconf_cache/ix86-common index beed9a24a1e4..8eb82deae467 100644 --- a/common/environment/configure/autoconf_cache/ix86-common +++ b/common/environment/configure/autoconf_cache/ix86-common @@ -120,7 +120,7 @@ lftp_cv_va_val_copy=${lftp_cv_va_val_copy=yes} # libidl libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll} -# libnet +# libnet ac_cv_lbl_unaligned_fail=${ac_cv_lbl_unaligned_fail=no} ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes} diff --git a/common/travis/xlint.sh b/common/travis/xlint.sh index 327417c1c327..790791ef1733 100755 --- a/common/travis/xlint.sh +++ b/common/travis/xlint.sh @@ -2,7 +2,7 @@ # # xlint.sh -[ "$XLINT" ] || exit 0 +[ "$XLINT" ] || exit 0 EXITCODE=0 read base tip < /tmp/revisions diff --git a/common/xbps-src/shutils/consistency_check.sh b/common/xbps-src/shutils/consistency_check.sh index cd70f4a9cbab..6a5b2ec19975 100644 --- a/common/xbps-src/shutils/consistency_check.sh +++ b/common/xbps-src/shutils/consistency_check.sh @@ -22,7 +22,7 @@ consistency_convert_pkgname () { ;; esac case "$dep" in - *\<*|*\>*|*=*) + *\<*|*\>*|*=*) printf "%s %s %s\n" "$dep" "$origname" "$deplabel" continue ;;