From 68833cc864da341fbe554bd05e0cac9edf5804dc Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 6 Nov 2022 14:03:38 +0900 Subject: [PATCH] */build.sh: Fix indent for packages the mantainer of which is @termux. %ci:no-build --- packages/alass/build.sh | 26 +++++++++--------- packages/atool/build.sh | 9 +++---- packages/brogue/build.sh | 2 +- packages/cc65/build.sh | 10 +++---- packages/cmusfm/build.sh | 2 +- packages/crawl/build.sh | 10 +++---- packages/dasm/build.sh | 2 +- packages/dcmtk/build.sh | 2 +- packages/debootstrap/build.sh | 4 +-- packages/direnv/build.sh | 2 +- packages/direvent/build.sh | 2 +- packages/discordo/build.sh | 10 +++---- packages/elinks/build.sh | 2 +- packages/guile/build.sh | 4 +-- packages/icecast/build.sh | 2 +- packages/ipcalc/build.sh | 2 +- packages/jcal/build.sh | 12 ++++----- packages/jython/build.sh | 4 +-- packages/libmaa/build.sh | 2 +- packages/libosmpbf/build.sh | 2 +- packages/libpngwriter/build.sh | 2 +- packages/libspice-protocol/build.sh | 4 +-- packages/libssh/build.sh | 2 +- packages/libtd/build.sh | 6 ++--- packages/libtinyxml/build.sh | 8 +++--- packages/libusbmuxd/build.sh | 9 ++++--- packages/mbedtls/build.sh | 2 +- packages/megatools/build.sh | 8 +++--- packages/monolith/build.sh | 2 +- packages/moria/build.sh | 8 +++--- packages/oidn/build.sh | 24 ++++++++--------- packages/pianobar/build.sh | 4 +-- packages/rappel/build.sh | 4 +-- packages/salty-chat/build.sh | 6 ++--- packages/screenfetch/build.sh | 4 +-- packages/usbmuxd/build.sh | 9 ++++--- packages/watchexec/build.sh | 38 +++++++++++++-------------- packages/zsh/build.sh | 4 +-- root-packages/bettercap/build.sh | 2 +- root-packages/docker-compose/build.sh | 2 +- root-packages/hwinfo/build.sh | 4 +-- root-packages/testdisk/build.sh | 2 +- x11-packages/bdftopcf/build.sh | 2 +- x11-packages/eww/build.sh | 6 ++--- x11-packages/gtk2/build.sh | 2 +- x11-packages/netsurf/build.sh | 10 +++---- x11-packages/qt5-qtscript/build.sh | 26 +++++++++--------- x11-packages/texworks/build.sh | 4 +-- 48 files changed, 158 insertions(+), 157 deletions(-) diff --git a/packages/alass/build.sh b/packages/alass/build.sh index 3cf30b7499..e00554da05 100644 --- a/packages/alass/build.sh +++ b/packages/alass/build.sh @@ -14,20 +14,20 @@ termux_step_pre_configure() { } termux_step_make_install() { - termux_setup_rust - cargo install \ - --jobs $TERMUX_MAKE_PROCESSES \ - --path alass-cli \ - --force \ - --locked \ - --target $CARGO_TARGET_NAME \ - --root $TERMUX_PREFIX \ - $TERMUX_PKG_EXTRA_CONFIGURE_ARGS - # https://github.com/rust-lang/cargo/issues/3316: - rm -f $TERMUX_PREFIX/.crates.toml - rm -f $TERMUX_PREFIX/.crates2.json + termux_setup_rust + cargo install \ + --jobs $TERMUX_MAKE_PROCESSES \ + --path alass-cli \ + --force \ + --locked \ + --target $CARGO_TARGET_NAME \ + --root $TERMUX_PREFIX \ + $TERMUX_PKG_EXTRA_CONFIGURE_ARGS + # https://github.com/rust-lang/cargo/issues/3316: + rm -f $TERMUX_PREFIX/.crates.toml + rm -f $TERMUX_PREFIX/.crates2.json } termux_step_post_make_install() { - install -Dm644 LICENSE "$TERMUX_PREFIX/share/licenses/alass/LICENSE" + install -Dm644 LICENSE "$TERMUX_PREFIX/share/licenses/alass/LICENSE" } diff --git a/packages/atool/build.sh b/packages/atool/build.sh index e9dee1299d..6daacc6017 100644 --- a/packages/atool/build.sh +++ b/packages/atool/build.sh @@ -9,12 +9,11 @@ TERMUX_PKG_SHA256="aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc7 TERMUX_PKG_DEPENDS="perl" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_RECOMMENDS="file,binutils,bzip2,cpio,gzip,lhasa,liblzma,lzop,lzip \ - ,p7zip,tar,unrar,zip,unzip,arj,zstd" +TERMUX_PKG_RECOMMENDS="file, binutils, bzip2, cpio, gzip, lhasa, liblzma, lzop, lzip, p7zip, tar, unrar, zip, unzip, arj, zstd" TERMUX_PKG_SUGGESTS="bash-completion" termux_step_post_make_install() { - mkdir -p "$TERMUX_PREFIX/share/bash-completion/completions" - install -Dm600 "extra/bash-completion-atool_0.1-1" \ - "$TERMUX_PREFIX/share/bash-completion/completions/atool" + mkdir -p "$TERMUX_PREFIX/share/bash-completion/completions" + install -Dm600 "extra/bash-completion-atool_0.1-1" \ + "$TERMUX_PREFIX/share/bash-completion/completions/atool" } diff --git a/packages/brogue/build.sh b/packages/brogue/build.sh index 9b77caeb26..f0e79ce2c5 100644 --- a/packages/brogue/build.sh +++ b/packages/brogue/build.sh @@ -10,7 +10,7 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_GROUPS="games" termux_step_pre_configure () { - CFLAGS+=" -fcommon" + CFLAGS+=" -fcommon" CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS" } diff --git a/packages/cc65/build.sh b/packages/cc65/build.sh index ac71c0ffca..091b2b66dd 100644 --- a/packages/cc65/build.sh +++ b/packages/cc65/build.sh @@ -9,9 +9,9 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_HOSTBUILD=true termux_step_host_build() { - cd $TERMUX_PKG_SRCDIR - make clean - make + cd $TERMUX_PKG_SRCDIR + make clean + make } termux_step_pre_configure() { @@ -20,6 +20,6 @@ termux_step_pre_configure() { } termux_step_make() { - make clean -C src - make bin + make clean -C src + make bin } diff --git a/packages/cmusfm/build.sh b/packages/cmusfm/build.sh index 9b6419be92..25fd8ee54a 100644 --- a/packages/cmusfm/build.sh +++ b/packages/cmusfm/build.sh @@ -8,5 +8,5 @@ TERMUX_PKG_SHA256=ff5338d4b473a3e295f3ae4273fb097c0f79c42e3d803eefdf372b51dba606 TERMUX_PKG_DEPENDS=libcurl termux_step_pre_configure() { - autoreconf --install + autoreconf --install } diff --git a/packages/crawl/build.sh b/packages/crawl/build.sh index bb2b60c24d..9b72b44f0d 100644 --- a/packages/crawl/build.sh +++ b/packages/crawl/build.sh @@ -9,13 +9,13 @@ TERMUX_PKG_DEPENDS="ncurses, zlib" TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { - export CROSSHOST="$TERMUX_HOST_PLATFORM" - export TERMUX_PKG_BUILDDIR="$TERMUX_PKG_SRCDIR/crawl-ref/source" + export CROSSHOST="$TERMUX_HOST_PLATFORM" + export TERMUX_PKG_BUILDDIR="$TERMUX_PKG_SRCDIR/crawl-ref/source" - export INCLUDES_L="-I$TERMUX_PREFIX/include" - export LIBS="-llog -Wl,--rpath=$TERMUX_PREFIX/lib" + export INCLUDES_L="-I$TERMUX_PREFIX/include" + export LIBS="-llog -Wl,--rpath=$TERMUX_PREFIX/lib" } termux_step_post_configure() { - sed -i 's,#ifdef __ANDROID__,#ifdef __NO_THANKS__,g' "$TERMUX_PKG_BUILDDIR/syscalls.cc" + sed -i 's,#ifdef __ANDROID__,#ifdef __NO_THANKS__,g' "$TERMUX_PKG_BUILDDIR/syscalls.cc" } diff --git a/packages/dasm/build.sh b/packages/dasm/build.sh index fdbdec3556..0046214b49 100644 --- a/packages/dasm/build.sh +++ b/packages/dasm/build.sh @@ -9,5 +9,5 @@ TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true termux_step_make_install() { - cp $TERMUX_PKG_SRCDIR/bin/* $TERMUX_PREFIX/bin/ + cp $TERMUX_PKG_SRCDIR/bin/* $TERMUX_PREFIX/bin/ } diff --git a/packages/dcmtk/build.sh b/packages/dcmtk/build.sh index a02fdc3af2..ce453f6820 100644 --- a/packages/dcmtk/build.sh +++ b/packages/dcmtk/build.sh @@ -28,5 +28,5 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" " termux_step_pre_configure() { - cp $TERMUX_PKG_BUILDER_DIR/arith.h/$TERMUX_ARCH.h $TERMUX_PKG_SRCDIR/config/include/dcmtk/config/arith.h + cp $TERMUX_PKG_BUILDER_DIR/arith.h/$TERMUX_ARCH.h $TERMUX_PKG_SRCDIR/config/include/dcmtk/config/arith.h } diff --git a/packages/debootstrap/build.sh b/packages/debootstrap/build.sh index 4340983855..f7cb5162bf 100644 --- a/packages/debootstrap/build.sh +++ b/packages/debootstrap/build.sh @@ -10,6 +10,6 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_post_make_install() { - mkdir -p ${TERMUX_PREFIX}/share/man/man8/ - install ${TERMUX_PKG_SRCDIR}/debootstrap.8 ${TERMUX_PREFIX}/share/man/man8/ + mkdir -p ${TERMUX_PREFIX}/share/man/man8/ + install ${TERMUX_PKG_SRCDIR}/debootstrap.8 ${TERMUX_PREFIX}/share/man/man8/ } diff --git a/packages/direnv/build.sh b/packages/direnv/build.sh index 3aa1da6a25..fa8d405259 100644 --- a/packages/direnv/build.sh +++ b/packages/direnv/build.sh @@ -9,5 +9,5 @@ TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { - termux_setup_golang + termux_setup_golang } diff --git a/packages/direvent/build.sh b/packages/direvent/build.sh index 9931b6a9dc..42f8b2a22e 100644 --- a/packages/direvent/build.sh +++ b/packages/direvent/build.sh @@ -8,5 +8,5 @@ TERMUX_PKG_SHA256=9405a8a77da49fe92bbe4af18bf925ff91f6d3374c10b7d700a031bacb94c4 TERMUX_PKG_DEPENDS="libandroid-glob" termux_step_pre_configure() { - export LIBS="-landroid-glob" + export LIBS="-landroid-glob" } diff --git a/packages/discordo/build.sh b/packages/discordo/build.sh index ace172ec3c..cf29cef3db 100644 --- a/packages/discordo/build.sh +++ b/packages/discordo/build.sh @@ -11,16 +11,16 @@ TERMUX_PKG_DEPENDS="golang" TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { - termux_setup_golang + termux_setup_golang - go mod init || : - go mod tidy + go mod init || : + go mod tidy } termux_step_make() { - go build -trimpath -buildmode=pie -ldflags "-s -w" . + go build -trimpath -buildmode=pie -ldflags "-s -w" . } termux_step_make_install() { - install -Dm700 -t "${TERMUX_PREFIX}"/bin "$TERMUX_PKG_SRCDIR"/discordo + install -Dm700 -t "${TERMUX_PREFIX}"/bin "$TERMUX_PKG_SRCDIR"/discordo } diff --git a/packages/elinks/build.sh b/packages/elinks/build.sh index a6a21abedc..f6d78d86b9 100644 --- a/packages/elinks/build.sh +++ b/packages/elinks/build.sh @@ -21,5 +21,5 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" TERMUX_MAKE_PROCESSES=1 termux_step_pre_configure() { - ./autogen.sh + ./autogen.sh } diff --git a/packages/guile/build.sh b/packages/guile/build.sh index 2c44a261b7..88f0e87f41 100644 --- a/packages/guile/build.sh +++ b/packages/guile/build.sh @@ -32,5 +32,5 @@ termux_step_post_configure() { } termux_step_post_massage() { - sed -i 's',"$TERMUX_STANDALONE_TOOLCHAIN/bin/$TERMUX_HOST_PLATFORM-pkg-config","$TERMUX_PREFIX/bin/pkg-config",'g' $TERMUX_PKG_MASSAGEDIR$TERMUX_PREFIX/bin/guile-config -} + sed -i 's',"$TERMUX_STANDALONE_TOOLCHAIN/bin/$TERMUX_HOST_PLATFORM-pkg-config","$TERMUX_PREFIX/bin/pkg-config",'g' $TERMUX_PKG_MASSAGEDIR$TERMUX_PREFIX/bin/guile-config +} diff --git a/packages/icecast/build.sh b/packages/icecast/build.sh index 25241b7b23..36b50b02c9 100644 --- a/packages/icecast/build.sh +++ b/packages/icecast/build.sh @@ -10,5 +10,5 @@ TERMUX_PKG_DEPENDS="libcurl, libgnutls, libogg, libvorbis, libxml2, libxslt, mim TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { - perl -p -i -e "s#/etc/mime.types#$TERMUX_PREFIX/etc/mime.types#" $TERMUX_PKG_SRCDIR/src/cfgfile.c + perl -p -i -e "s#/etc/mime.types#$TERMUX_PREFIX/etc/mime.types#" $TERMUX_PKG_SRCDIR/src/cfgfile.c } diff --git a/packages/ipcalc/build.sh b/packages/ipcalc/build.sh index c99ff5c551..4d180f8a3d 100644 --- a/packages/ipcalc/build.sh +++ b/packages/ipcalc/build.sh @@ -9,6 +9,6 @@ TERMUX_PKG_SHA256=a4dbfaeb7511b81830793ab9936bae9d7b1b561ad33e29106faaaf97ba1c11 TERMUX_PKG_AUTO_UPDATE=true termux_step_make_install() { - cp $TERMUX_PKG_SRCDIR/ipcalc $TERMUX_PREFIX/bin/ + cp $TERMUX_PKG_SRCDIR/ipcalc $TERMUX_PREFIX/bin/ } diff --git a/packages/jcal/build.sh b/packages/jcal/build.sh index ebabe0e9e6..1ff702ac74 100644 --- a/packages/jcal/build.sh +++ b/packages/jcal/build.sh @@ -8,13 +8,13 @@ TERMUX_PKG_SHA256=b55edc605eda0a5b25b8009391dcaeb3c8ba88d1fb3337a071f555983a114c TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { - cd sources - ./autogen.sh - sed --in-place 's/$RM "$cfgfile"/$RM -f "$cfgfile"/g' configure - TERMUX_PKG_SRCDIR+="/sources" + cd sources + ./autogen.sh + sed --in-place 's/$RM "$cfgfile"/$RM -f "$cfgfile"/g' configure + TERMUX_PKG_SRCDIR+="/sources" } termux_step_post_configure() { - # removing tests - sed --in-place 's/test_kit//g' sources/Makefile.am + # removing tests + sed --in-place 's/test_kit//g' sources/Makefile.am } diff --git a/packages/jython/build.sh b/packages/jython/build.sh index f21227151a..84b6a4c516 100644 --- a/packages/jython/build.sh +++ b/packages/jython/build.sh @@ -23,6 +23,6 @@ termux_step_make() { termux_step_make_install() { rm -rf $TERMUX_PREFIX/opt/jython mkdir -p $TERMUX_PREFIX/opt/jython - cp -a $TERMUX_PKG_SRCDIR/dist/* $TERMUX_PREFIX/opt/jython/ - ln -sfr $TERMUX_PREFIX/opt/jython/bin/jython $TERMUX_PREFIX/bin/jython + cp -a $TERMUX_PKG_SRCDIR/dist/* $TERMUX_PREFIX/opt/jython/ + ln -sfr $TERMUX_PREFIX/opt/jython/bin/jython $TERMUX_PREFIX/bin/jython } diff --git a/packages/libmaa/build.sh b/packages/libmaa/build.sh index c4c7851d66..b8b47ce8cd 100644 --- a/packages/libmaa/build.sh +++ b/packages/libmaa/build.sh @@ -8,5 +8,5 @@ TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/dict/libmaa/libmaa-$ TERMUX_PKG_SHA256=59a5a01e3a9036bd32160ec535d25b72e579824e391fea7079e9c40b0623b1c5 termux_step_pre_configure() { - autoreconf -ivf + autoreconf -ivf } diff --git a/packages/libosmpbf/build.sh b/packages/libosmpbf/build.sh index 1236e5025a..f16cf19f28 100644 --- a/packages/libosmpbf/build.sh +++ b/packages/libosmpbf/build.sh @@ -10,5 +10,5 @@ TERMUX_PKG_DEPENDS="libprotobuf" TERMUX_PKG_GROUPS="science" termux_step_pre_configure() { - termux_setup_protobuf + termux_setup_protobuf } diff --git a/packages/libpngwriter/build.sh b/packages/libpngwriter/build.sh index f7bd594205..45a26dacaa 100644 --- a/packages/libpngwriter/build.sh +++ b/packages/libpngwriter/build.sh @@ -9,5 +9,5 @@ TERMUX_PKG_DEPENDS="zlib,freetype,libpng" TERMUX_PKG_AUTO_UPDATE=true termux_step_post_make_install() { - mv "$TERMUX_PREFIX"/lib/libPNGwriter_shared.so libPNGwriter.so + mv "$TERMUX_PREFIX"/lib/libPNGwriter_shared.so libPNGwriter.so } diff --git a/packages/libspice-protocol/build.sh b/packages/libspice-protocol/build.sh index 57cc08e2b2..2e500def6d 100644 --- a/packages/libspice-protocol/build.sh +++ b/packages/libspice-protocol/build.sh @@ -7,6 +7,6 @@ TERMUX_PKG_SRCURL=https://www.spice-space.org/download/releases/spice-protocol-$ TERMUX_PKG_SHA256=f986e5bc2a1598532c4897f889afb0df9257ac21c160c083703ae7c8de99487a termux_step_post_make_install() { - mv "${TERMUX_PREFIX}"/share/pkgconfig/spice-protocol.pc \ - "${TERMUX_PREFIX}"/lib/pkgconfig + mv "${TERMUX_PREFIX}"/share/pkgconfig/spice-protocol.pc \ + "${TERMUX_PREFIX}"/lib/pkgconfig } diff --git a/packages/libssh/build.sh b/packages/libssh/build.sh index 33a4475f73..5cf1d43d92 100644 --- a/packages/libssh/build.sh +++ b/packages/libssh/build.sh @@ -12,4 +12,4 @@ TERMUX_PKG_REPLACES="libssh-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DHAVE_ARGP_H=OFF -DWITH_GSSAPI=OFF - " +" diff --git a/packages/libtd/build.sh b/packages/libtd/build.sh index 583a91fe7f..1a0cc8131c 100644 --- a/packages/libtd/build.sh +++ b/packages/libtd/build.sh @@ -9,9 +9,9 @@ TERMUX_PKG_DEPENDS="readline, openssl (>= 1.1.1), zlib" TERMUX_PKG_HOSTBUILD=true termux_step_host_build() { - termux_setup_cmake - cmake "-DCMAKE_BUILD_TYPE=Release" "$TERMUX_PKG_SRCDIR" - cmake --build . --target prepare_cross_compiling + termux_setup_cmake + cmake "-DCMAKE_BUILD_TYPE=Release" "$TERMUX_PKG_SRCDIR" + cmake --build . --target prepare_cross_compiling } termux_step_post_make_install() { diff --git a/packages/libtinyxml/build.sh b/packages/libtinyxml/build.sh index 1d66925d5c..94ec3590ed 100644 --- a/packages/libtinyxml/build.sh +++ b/packages/libtinyxml/build.sh @@ -11,8 +11,8 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="libc++" termux_step_make_install() { - install -m 0755 libtinyxml.so \ - "$TERMUX_PREFIX/lib/" - install -m 0644 tinyxml.h tinystr.h \ - "$TERMUX_PREFIX/include/" + install -m 0755 libtinyxml.so \ + "$TERMUX_PREFIX/lib/" + install -m 0644 tinyxml.h tinystr.h \ + "$TERMUX_PREFIX/include/" } diff --git a/packages/libusbmuxd/build.sh b/packages/libusbmuxd/build.sh index 70bcfec21b..0c50825947 100644 --- a/packages/libusbmuxd/build.sh +++ b/packages/libusbmuxd/build.sh @@ -11,8 +11,9 @@ TERMUX_PKG_DEPENDS="libusb, libplist, usbmuxd" TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure() { - ./autogen.sh --prefix=$TERMUX_PREFIX \ - --without-preflight \ - --without-systemd \ - --host=$TERMUX_HOST_PLATFORM + ./autogen.sh \ + --prefix=$TERMUX_PREFIX \ + --without-preflight \ + --without-systemd \ + --host=$TERMUX_HOST_PLATFORM } diff --git a/packages/mbedtls/build.sh b/packages/mbedtls/build.sh index fefc4b8991..04ce740556 100644 --- a/packages/mbedtls/build.sh +++ b/packages/mbedtls/build.sh @@ -15,7 +15,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DUSE_SHARED_MBEDTLS_LIBRARY=ON -DENABLE_TESTING=OFF -DENABLE_PROGRAMS=OFF - " +" termux_step_post_get_source() { # Do not forget to bump revision of reverse dependencies and rebuild them diff --git a/packages/megatools/build.sh b/packages/megatools/build.sh index adc7b0d100..7a94f82c90 100644 --- a/packages/megatools/build.sh +++ b/packages/megatools/build.sh @@ -11,9 +11,9 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-fuse --enable-docs-build" TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { - mkdir -p m4 - autoreconf -v --install + mkdir -p m4 + autoreconf -v --install - sed -i -e 's/-V -qversion//' configure - sed -i -e 's/GOBJECT_INTROSPECTION_CHECK/#GOBJECT_INTROSPECTION_CHECK/' configure + sed -i -e 's/-V -qversion//' configure + sed -i -e 's/GOBJECT_INTROSPECTION_CHECK/#GOBJECT_INTROSPECTION_CHECK/' configure } diff --git a/packages/monolith/build.sh b/packages/monolith/build.sh index 22360e6648..714291851e 100644 --- a/packages/monolith/build.sh +++ b/packages/monolith/build.sh @@ -10,5 +10,5 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="openssl" termux_step_pre_configure() { - rm -f Makefile + rm -f Makefile } diff --git a/packages/moria/build.sh b/packages/moria/build.sh index 27a80c3228..104dcabe30 100644 --- a/packages/moria/build.sh +++ b/packages/moria/build.sh @@ -11,8 +11,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-Dbuild_dir=$TERMUX_PKG_BUILDDIR" TERMUX_PKG_GROUPS="games" termux_step_create_debscripts() { - # Create scores file in a debscript, so an update to the package wouldn't erease any scores - echo "mkdir -p $TERMUX_PREFIX/lib/games/moria/" > postinst - echo "touch $TERMUX_PREFIX/lib/games/moria/scores.dat" >> postinst - chmod 0755 postinst + # Create scores file in a debscript, so an update to the package wouldn't erease any scores + echo "mkdir -p $TERMUX_PREFIX/lib/games/moria/" > postinst + echo "touch $TERMUX_PREFIX/lib/games/moria/scores.dat" >> postinst + chmod 0755 postinst } diff --git a/packages/oidn/build.sh b/packages/oidn/build.sh index 173c95050b..18c37609a6 100644 --- a/packages/oidn/build.sh +++ b/packages/oidn/build.sh @@ -12,16 +12,16 @@ TERMUX_PKG_DEPENDS="libllvm, libtbb" TERMUX_PKG_BLACKLISTED_ARCHES="aarch64, arm, i686" termux_step_pre_configure() { - local ISPC_VERSION=1.18.0 - local ISPC_URL=https://github.com/ispc/ispc/releases/download/v$ISPC_VERSION/ispc-v$ISPC_VERSION-linux.tar.gz - local ISPC_TARFILE=$TERMUX_PKG_CACHEDIR/$(basename $ISPC_URL) - local ISPC_SHA256=6c379bb97962e9de7d24fd48b3f7e647dc42be898e9d187948220268c646b692 - termux_download $ISPC_URL $ISPC_TARFILE $ISPC_SHA256 - if [ ! -e "$TERMUX_PKG_CACHEDIR/.placeholder-ispc-v$ISPC_VERSION" ]; then - rm -rf $TERMUX_PKG_CACHEDIR/ispc-v$ISPC_VERSION-linux - tar -xvf $ISPC_TARFILE -C $TERMUX_PKG_CACHEDIR - touch "$TERMUX_PKG_CACHEDIR/.placeholder-ispc-v$ISPC_VERSION" - fi - export PATH="$TERMUX_PKG_CACHEDIR/ispc-v$ISPC_VERSION-linux/bin:$PATH" - LDFLAGS+=" -llog" + local ISPC_VERSION=1.18.0 + local ISPC_URL=https://github.com/ispc/ispc/releases/download/v$ISPC_VERSION/ispc-v$ISPC_VERSION-linux.tar.gz + local ISPC_TARFILE=$TERMUX_PKG_CACHEDIR/$(basename $ISPC_URL) + local ISPC_SHA256=6c379bb97962e9de7d24fd48b3f7e647dc42be898e9d187948220268c646b692 + termux_download $ISPC_URL $ISPC_TARFILE $ISPC_SHA256 + if [ ! -e "$TERMUX_PKG_CACHEDIR/.placeholder-ispc-v$ISPC_VERSION" ]; then + rm -rf $TERMUX_PKG_CACHEDIR/ispc-v$ISPC_VERSION-linux + tar -xvf $ISPC_TARFILE -C $TERMUX_PKG_CACHEDIR + touch "$TERMUX_PKG_CACHEDIR/.placeholder-ispc-v$ISPC_VERSION" + fi + export PATH="$TERMUX_PKG_CACHEDIR/ispc-v$ISPC_VERSION-linux/bin:$PATH" + LDFLAGS+=" -llog" } diff --git a/packages/pianobar/build.sh b/packages/pianobar/build.sh index f84417c905..8eebaa9764 100644 --- a/packages/pianobar/build.sh +++ b/packages/pianobar/build.sh @@ -11,6 +11,6 @@ TERMUX_PKG_BUILD_DEPENDS="libao, ffmpeg, libgcrypt, libcurl, json-c" TERMUX_PKG_BUILD_IN_SRC=true termux_step_post_make_install(){ - #install useful script - install -Dm755 "$TERMUX_PKG_SRCDIR"/contrib/headless_pianobar "$TERMUX_PREFIX"/bin/pianoctl + #install useful script + install -Dm755 "$TERMUX_PKG_SRCDIR"/contrib/headless_pianobar "$TERMUX_PREFIX"/bin/pianoctl } diff --git a/packages/rappel/build.sh b/packages/rappel/build.sh index e93d6e35bd..02371dfd13 100644 --- a/packages/rappel/build.sh +++ b/packages/rappel/build.sh @@ -20,8 +20,8 @@ termux_step_make() { _ARCH="x86" elif [ "$TERMUX_ARCH" = "x86_64" ]; then _ARCH="amd64" - elif [ "$TERMUX_ARCH" = "arm" ]; then - _ARCH="armv7" + elif [ "$TERMUX_ARCH" = "arm" ]; then + _ARCH="armv7" elif [ "$TERMUX_ARCH" = "aarch64" ]; then _ARCH="armv8" else diff --git a/packages/salty-chat/build.sh b/packages/salty-chat/build.sh index 2b6a6e5921..be88810aaa 100644 --- a/packages/salty-chat/build.sh +++ b/packages/salty-chat/build.sh @@ -8,10 +8,10 @@ TERMUX_PKG_SHA256=6313a4b3b0b53e899f4612701dbf4d4abd212b51f48a69461309d136338a40 TERMUX_PKG_BUILD_IN_SRC=true termux_step_pre_configure() { - termux_setup_golang + termux_setup_golang - go mod init || : - go mod tidy + go mod init || : + go mod tidy } diff --git a/packages/screenfetch/build.sh b/packages/screenfetch/build.sh index e464712865..54c42e8f9f 100644 --- a/packages/screenfetch/build.sh +++ b/packages/screenfetch/build.sh @@ -12,6 +12,6 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_PLATFORM_INDEPENDENT=true termux_step_make_install() { - install screenfetch-dev ${TERMUX_PREFIX}/bin/screenfetch - install screenfetch.1 ${TERMUX_PREFIX}/share/man/man1/ + install screenfetch-dev ${TERMUX_PREFIX}/bin/screenfetch + install screenfetch.1 ${TERMUX_PREFIX}/share/man/man1/ } diff --git a/packages/usbmuxd/build.sh b/packages/usbmuxd/build.sh index e8c2219505..e1e76e1a8d 100644 --- a/packages/usbmuxd/build.sh +++ b/packages/usbmuxd/build.sh @@ -11,8 +11,9 @@ TERMUX_PKG_DEPENDS="libusb, libplist" TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure() { - ./autogen.sh --prefix=$TERMUX_PREFIX \ - --without-preflight \ - --without-systemd \ - --host=$TERMUX_HOST_PLATFORM + ./autogen.sh \ + --prefix=$TERMUX_PREFIX \ + --without-preflight \ + --without-systemd \ + --host=$TERMUX_HOST_PLATFORM } diff --git a/packages/watchexec/build.sh b/packages/watchexec/build.sh index 2b67e630d9..a7ea42f985 100644 --- a/packages/watchexec/build.sh +++ b/packages/watchexec/build.sh @@ -10,26 +10,26 @@ TERMUX_PKG_DEPENDS="zlib" TERMUX_PKG_BUILD_IN_SRC=true termux_step_make_install() { - termux_setup_rust - cargo install \ - --jobs $TERMUX_MAKE_PROCESSES \ - --path cli \ - --force \ - --locked \ - --target $CARGO_TARGET_NAME \ - --root $TERMUX_PREFIX \ - $TERMUX_PKG_EXTRA_CONFIGURE_ARGS - # https://github.com/rust-lang/cargo/issues/3316: - rm -f $TERMUX_PREFIX/.crates.toml - rm -f $TERMUX_PREFIX/.crates2.json + termux_setup_rust + cargo install \ + --jobs $TERMUX_MAKE_PROCESSES \ + --path cli \ + --force \ + --locked \ + --target $CARGO_TARGET_NAME \ + --root $TERMUX_PREFIX \ + $TERMUX_PKG_EXTRA_CONFIGURE_ARGS + # https://github.com/rust-lang/cargo/issues/3316: + rm -f $TERMUX_PREFIX/.crates.toml + rm -f $TERMUX_PREFIX/.crates2.json } termux_step_post_make_install() { - install -Dm644 -t "$TERMUX_PREFIX"/share/doc/watchexec/watchexec.1.html \ - "$TERMUX_PKG_SRCDIR"/doc/watchexec.1.html - install -Dm644 -t "$TERMUX_PREFIX"/share/man/man1/watchexec.1 \ - "$TERMUX_PKG_SRCDIR"/doc/watchexec.1 - install -Dm644 "completions/zsh" \ - "$TERMUX_PREFIX/share/zsh/site-functions/_watchexec" - install -Dm644 LICENSE "$TERMUX_PREFIX/share/licenses/watchexec/LICENSE" + install -Dm644 -t "$TERMUX_PREFIX"/share/doc/watchexec/watchexec.1.html \ + "$TERMUX_PKG_SRCDIR"/doc/watchexec.1.html + install -Dm644 -t "$TERMUX_PREFIX"/share/man/man1/watchexec.1 \ + "$TERMUX_PKG_SRCDIR"/doc/watchexec.1 + install -Dm644 "completions/zsh" \ + "$TERMUX_PREFIX/share/zsh/site-functions/_watchexec" + install -Dm644 LICENSE "$TERMUX_PREFIX/share/licenses/watchexec/LICENSE" } diff --git a/packages/zsh/build.sh b/packages/zsh/build.sh index 3477defc73..4be916c3fd 100644 --- a/packages/zsh/build.sh +++ b/packages/zsh/build.sh @@ -49,11 +49,11 @@ termux_step_pre_configure() { cat configure.newf > configure rm configure.newf - TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" zsh_cv_off_t_is_64_bit=yes " else - TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" zsh_cv_64_bit_type=long " fi diff --git a/root-packages/bettercap/build.sh b/root-packages/bettercap/build.sh index 2fc446e9b9..93c6a1e7e2 100644 --- a/root-packages/bettercap/build.sh +++ b/root-packages/bettercap/build.sh @@ -15,7 +15,7 @@ termux_step_configure() { mkdir -p "$GOPATH"/src/github.com/bettercap/ cp -a "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/bettercap/bettercap - go get github.com/bettercap/recording + go get github.com/bettercap/recording } termux_step_make() { diff --git a/root-packages/docker-compose/build.sh b/root-packages/docker-compose/build.sh index ace34081e9..8861a6fdb5 100644 --- a/root-packages/docker-compose/build.sh +++ b/root-packages/docker-compose/build.sh @@ -12,7 +12,7 @@ termux_step_make() { export GOPATH=$TERMUX_PKG_BUILDDIR cd $TERMUX_PKG_SRCDIR mkdir bin/ - if ! [ -z "$GOOS" ];then export GOOS=android;fi + if ! [ -z "$GOOS" ];then export GOOS=android;fi go build -o bin/docker-compose -ldflags="-s -w -X github.com/docker/compose/v2/internal.Version=${TERMUX_PKG_VERSION}" ./cmd } diff --git a/root-packages/hwinfo/build.sh b/root-packages/hwinfo/build.sh index 2d124d146d..4e82ad8925 100644 --- a/root-packages/hwinfo/build.sh +++ b/root-packages/hwinfo/build.sh @@ -22,6 +22,6 @@ termux_step_pre_configure() { termux_step_configure() { echo 'touch changelog' > git2log LDFLAGS+=" -landroid-shmem" - export HWINFO_VERSION="$TERMUX_PKG_VERSION" - export DESTDIR="$TERMUX_PREFIX" + export HWINFO_VERSION="$TERMUX_PKG_VERSION" + export DESTDIR="$TERMUX_PREFIX" } diff --git a/root-packages/testdisk/build.sh b/root-packages/testdisk/build.sh index 789bbb7f9f..fdcfb3a4f8 100644 --- a/root-packages/testdisk/build.sh +++ b/root-packages/testdisk/build.sh @@ -23,5 +23,5 @@ termux_step_pre_configure() { } termux_step_make() { - make -j2 static + make -j2 static } diff --git a/x11-packages/bdftopcf/build.sh b/x11-packages/bdftopcf/build.sh index c3d7a9be8d..b6394af649 100644 --- a/x11-packages/bdftopcf/build.sh +++ b/x11-packages/bdftopcf/build.sh @@ -10,5 +10,5 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="xorgproto, libx11, xorg-util-macros" termux_step_pre_configure() { - NOCONFIGURE=1 ./autogen.sh + NOCONFIGURE=1 ./autogen.sh } diff --git a/x11-packages/eww/build.sh b/x11-packages/eww/build.sh index b6cc876a03..929107053a 100644 --- a/x11-packages/eww/build.sh +++ b/x11-packages/eww/build.sh @@ -9,10 +9,10 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true termux_step_make() { - termux_setup_rust - cargo build --jobs $TERMUX_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release + termux_setup_rust + cargo build --jobs $TERMUX_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release } termux_step_make_install() { - install -Dm700 -t $TERMUX_PREFIX/bin target/${CARGO_TARGET_NAME}/release/eww + install -Dm700 -t $TERMUX_PREFIX/bin target/${CARGO_TARGET_NAME}/release/eww } diff --git a/x11-packages/gtk2/build.sh b/x11-packages/gtk2/build.sh index 95827b095b..4a4574d2d0 100644 --- a/x11-packages/gtk2/build.sh +++ b/x11-packages/gtk2/build.sh @@ -44,7 +44,7 @@ termux_step_post_configure() { termux_step_create_debscripts() { for i in postinst postrm triggers; do - sed \ + sed \ "s|@TERMUX_PREFIX@|${TERMUX_PREFIX}|g" \ "${TERMUX_PKG_BUILDER_DIR}/hooks/${i}.in" > ./${i} chmod 755 ./${i} diff --git a/x11-packages/netsurf/build.sh b/x11-packages/netsurf/build.sh index f604aa0c36..ed0dc53096 100644 --- a/x11-packages/netsurf/build.sh +++ b/x11-packages/netsurf/build.sh @@ -11,7 +11,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gtk3" TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure () { - echo CC=$CC + echo CC=$CC export HOST=`$CC -dumpmachine` export BUILD=`$CC_FOR_BUILD -dumpmachine` export CFLAGS+=" -I${TERMUX_PREFIX}/include" @@ -20,21 +20,21 @@ termux_step_configure () { mkdir -p netsurf/build/Linux-gtk3 # Note: NETSURF_USE_DUKTAPE= disables javascript, because I couldn't figure out how to build # required the nsgenbind tool so that it can be executed on the *host* (it is used during the build process only) - make PREFIX="${TERMUX_PREFIX}" NETSURF_GTK_MAJOR=3 NETSURF_USE_DUKTAPE=NO NETSURF_USE_LIBICONV_PLUG=NO toolchain=clang + make PREFIX="${TERMUX_PREFIX}" NETSURF_GTK_MAJOR=3 NETSURF_USE_DUKTAPE=NO NETSURF_USE_LIBICONV_PLUG=NO toolchain=clang } termux_step_make() { # Nothing to do - echo CC=$CC + echo CC=$CC } termux_step_make_install () { - echo CC=$CC + echo CC=$CC export HOST=`$CC -dumpmachine` export BUILD=`$CC_FOR_BUILD -dumpmachine` export CFLAGS+=" -I${TERMUX_PREFIX}/include" export CPPFLAGS+=" -I${TERMUX_PREFIX}/include" export CXXFLAGS+=" -I${TERMUX_PREFIX}/include" - make install PREFIX="${TERMUX_PREFIX}" NETSURF_GTK_MAJOR=3 NETSURF_USE_DUKTAPE=NO NETSURF_USE_LIBICONV_PLUG=NO toolchain=clang + make install PREFIX="${TERMUX_PREFIX}" NETSURF_GTK_MAJOR=3 NETSURF_USE_DUKTAPE=NO NETSURF_USE_LIBICONV_PLUG=NO toolchain=clang ln -sfr $TERMUX_PREFIX/bin/netsurf-gtk3 $TERMUX_PREFIX/bin/netsurf } diff --git a/x11-packages/qt5-qtscript/build.sh b/x11-packages/qt5-qtscript/build.sh index 92dadc833d..26f5773c87 100644 --- a/x11-packages/qt5-qtscript/build.sh +++ b/x11-packages/qt5-qtscript/build.sh @@ -12,23 +12,23 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_NO_STATICSPLIT=true termux_step_configure () { - "${TERMUX_PREFIX}/opt/qt/cross/bin/qmake" \ - -spec "${TERMUX_PREFIX}/lib/qt/mkspecs/termux-cross" + "${TERMUX_PREFIX}/opt/qt/cross/bin/qmake" \ + -spec "${TERMUX_PREFIX}/lib/qt/mkspecs/termux-cross" } termux_step_make_install() { - make install + make install - ####################################################### - ## - ## Fixes & cleanup. - ## - ####################################################### + ####################################################### + ## + ## Fixes & cleanup. + ## + ####################################################### - ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir. - find "${TERMUX_PREFIX}/lib" -type f -name "libQt5Script*.prl" \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' "{}" \; + ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir. + find "${TERMUX_PREFIX}/lib" -type f -name "libQt5Script*.prl" \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' "{}" \; - ## Remove *.la files. - find "${TERMUX_PREFIX}/lib" -iname \*.la -delete + ## Remove *.la files. + find "${TERMUX_PREFIX}/lib" -iname \*.la -delete } diff --git a/x11-packages/texworks/build.sh b/x11-packages/texworks/build.sh index bcec50f586..3e9ce81c36 100644 --- a/x11-packages/texworks/build.sh +++ b/x11-packages/texworks/build.sh @@ -12,7 +12,7 @@ TERMUX_PKG_BUILD_DEPENDS="git, qt5-qtbase-cross-tools, qt5-qtdeclarative-cross-t TERMUX_PKG_AUTO_UPDATE=true termux_step_pre_configure() { - termux_setup_cmake + termux_setup_cmake - TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DLUA_MATH_LIBRARY=$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/libm.so" + TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DLUA_MATH_LIBRARY=$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/libm.so" }