From 7ddcce570199c1e6bc71585df222c7de5832edfb Mon Sep 17 00:00:00 2001 From: Wetitpig Date: Tue, 12 Feb 2019 16:41:30 +0800 Subject: [PATCH] No backticks --- build-all.sh | 10 +++++----- build-package.sh | 10 +++++----- disabled-packages/apt-updated/build.sh | 2 +- disabled-packages/dovecot/build.sh | 2 +- disabled-packages/openjdk-9-jre-headless/build.sh | 4 ++-- disabled-packages/unnethack/build.sh | 2 +- packages/apt/build.sh | 2 +- packages/bash/build.sh | 2 +- packages/busybox/build.sh | 2 +- packages/doxygen/build.sh | 6 +++--- packages/ecj/build.sh | 2 +- packages/ecj4.6/build.sh | 2 +- packages/git/build.sh | 2 +- packages/graphviz/build.sh | 2 +- packages/imagemagick/build.sh | 2 +- packages/ldc/build.sh | 2 +- packages/libcue/build.sh | 4 ++-- packages/libgrpc/build.sh | 4 ++-- packages/libllvm/build.sh | 2 +- packages/libpulseaudio/build.sh | 2 +- packages/librsync/build.sh | 2 +- packages/mariadb/build.sh | 10 +++++----- packages/neovim/build.sh | 8 ++++---- packages/openssh/source-ssh-agent.sh | 2 +- packages/readline/build.sh | 2 +- packages/ripgrep/build.sh | 6 +++--- packages/ruby/tests/default_encoding_isutf8.sh | 2 +- packages/rust/build.sh | 2 +- packages/serf/build.sh | 2 +- packages/tcl/build.sh | 2 +- packages/weechat/build.sh | 8 ++++---- scripts/check-versions.sh | 4 ++-- scripts/generate-repology-metadata.sh | 6 +++--- scripts/list-packages.sh | 2 +- scripts/list-versions.sh | 2 +- scripts/setup-android-sdk.sh | 6 +++--- scripts/setup-archlinux.sh | 2 +- scripts/setup-ubuntu.sh | 2 +- scripts/update-docker.sh | 4 ++-- 39 files changed, 70 insertions(+), 70 deletions(-) diff --git a/build-all.sh b/build-all.sh index aac8db59f5..f1bdf8fc93 100755 --- a/build-all.sh +++ b/build-all.sh @@ -38,7 +38,7 @@ if [[ ! "$TERMUX_ARCH" =~ ^(all|aarch64|arm|i686|x86_64)$ ]]; then exit 1 fi -BUILDSCRIPT=`dirname $0`/build-package.sh +BUILDSCRIPT=$(dirname $0)/build-package.sh BUILDALL_DIR=$TERMUX_TOPDIR/_buildall-$TERMUX_ARCH BUILDORDER_FILE=$BUILDALL_DIR/buildorder.txt BUILDSTATUS_FILE=$BUILDALL_DIR/buildstatus.txt @@ -57,8 +57,8 @@ exec > >(tee -a $BUILDALL_DIR/ALL.out) exec 2> >(tee -a $BUILDALL_DIR/ALL.err >&2) trap "echo ERROR: See $BUILDALL_DIR/\${package}.err" ERR -for package_path in `cat $BUILDORDER_FILE`; do - package=`basename $package_path` +for package_path in $(cat $BUILDORDER_FILE); do + package=$(basename $package_path) # Check build status (grepping is a bit crude, but it works) if [ -e $BUILDSTATUS_FILE ] && grep "^$package\$" $BUILDSTATUS_FILE >/dev/null; then echo "Skipping $package" @@ -66,11 +66,11 @@ for package_path in `cat $BUILDORDER_FILE`; do fi echo -n "Building $package... " - BUILD_START=`date "+%s"` + BUILD_START=$(date "+%s") bash -x $BUILDSCRIPT -a $TERMUX_ARCH $TERMUX_DEBUG \ ${TERMUX_DEBDIR+-o $TERMUX_DEBDIR} $TERMUX_INSTALL_DEPS $package \ > $BUILDALL_DIR/${package}.out 2> $BUILDALL_DIR/${package}.err - BUILD_END=`date "+%s"` + BUILD_END=$(date "+%s") BUILD_SECONDS=$(( $BUILD_END - $BUILD_START )) echo "done in $BUILD_SECONDS" diff --git a/build-package.sh b/build-package.sh index 594f282fc9..5840a045d7 100755 --- a/build-package.sh +++ b/build-package.sh @@ -719,7 +719,7 @@ termux_step_extract_package() { local folder set +o pipefail if [ "${file##*.}" = zip ]; then - folder=`unzip -qql "$file" | head -n1 | tr -s ' ' | cut -d' ' -f5-` + folder=$(unzip -qql "$file" | head -n1 | tr -s ' ' | cut -d' ' -f5-) rm -Rf $folder unzip -q "$file" mv $folder "$TERMUX_PKG_SRCDIR" @@ -871,7 +871,7 @@ termux_step_setup_toolchain() { local real_linker=$_TERMUX_TOOLCHAIN_TMPDIR/$TERMUX_HOST_PLATFORM/bin/$linker.real cp $wrap_linker $real_linker echo '#!/bin/bash' > $wrap_linker - echo -n '`dirname $0`/' >> $wrap_linker + echo -n '$(dirname $0)/' >> $wrap_linker echo -n $linker.real >> $wrap_linker echo ' --exclude-libs libgcc.a "$@"' >> $wrap_linker done @@ -1123,9 +1123,9 @@ termux_step_configure_cmake() { local MAKE_PROGRAM_PATH if [ $TERMUX_CMAKE_BUILD = Ninja ]; then termux_setup_ninja - MAKE_PROGRAM_PATH=`which ninja` + MAKE_PROGRAM_PATH=$(which ninja) else - MAKE_PROGRAM_PATH=`which make` + MAKE_PROGRAM_PATH=$(which make) fi # XXX: CMAKE_{AR,RANLIB} needed for at least jsoncpp build to not @@ -1248,7 +1248,7 @@ termux_step_massage() { rm -f lib/charset.alias # Remove non-english man pages: - test -d share/man && (cd share/man; for f in `ls | grep -v man`; do rm -Rf $f; done ) + test -d share/man && (cd share/man; for f in $(ls | grep -v man); do rm -Rf $f; done ) if [ -z "${TERMUX_PKG_KEEP_INFOPAGES+x}" ]; then # Remove info pages: diff --git a/disabled-packages/apt-updated/build.sh b/disabled-packages/apt-updated/build.sh index cf8519103c..93e6b4c49b 100644 --- a/disabled-packages/apt-updated/build.sh +++ b/disabled-packages/apt-updated/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=1.6~alpha3 TERMUX_PKG_SHA256=2acd561ff04fc3efa4c590139ca60cfdbc93787ea80334f7448ecf466faab119 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --DPERL_EXECUTABLE=`which perl` +-DPERL_EXECUTABLE=$(which perl) -DCMAKE_INSTALL_FULL_LOCALSTATEDIR=$TERMUX_PREFIX -DCOMMON_ARCH=$TERMUX_ARCH -DDPKG_DATADIR=$TERMUX_PREFIX/share/dpkg diff --git a/disabled-packages/dovecot/build.sh b/disabled-packages/dovecot/build.sh index 01222b7a25..e6b51a921d 100644 --- a/disabled-packages/dovecot/build.sh +++ b/disabled-packages/dovecot/build.sh @@ -27,7 +27,7 @@ lib_cv___va_copy=yes termux_step_pre_configure() { LDFLAGS="$LDFLAGS -llog" - for i in `find $TERMUX_PKG_SRCDIR/src/director -type f`; do sed 's|\bstruct user\b|struct usertest|g' -i $i; done + for i in $(find $TERMUX_PKG_SRCDIR/src/director -type f); do sed 's|\bstruct user\b|struct usertest|g' -i $i; done if [ "$TERMUX_ARCH" == "aarch64" ]; then TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="lib_cv_va_val_copy=yes" diff --git a/disabled-packages/openjdk-9-jre-headless/build.sh b/disabled-packages/openjdk-9-jre-headless/build.sh index e943616d4d..1d9435ee42 100644 --- a/disabled-packages/openjdk-9-jre-headless/build.sh +++ b/disabled-packages/openjdk-9-jre-headless/build.sh @@ -66,7 +66,7 @@ termux_step_post_extract_package() { # setup cups source dir file=$TERMUX_PKG_CACHEDIR/cups-$_cups_ver-source.tar.gz - url="https://github.com/apple/cups/releases/download/v$_cups_ver/`basename $file`" + url="https://github.com/apple/cups/releases/download/v$_cups_ver/$(basename $file)" termux_download $url $file ${sha256sums[8]} tar xf $file -C $TERMUX_PKG_SRCDIR } @@ -139,7 +139,7 @@ termux_step_post_make_install() { # create shell wrappers for binaries for binary in $TERMUX_PREFIX/$_jvm_dir/bin/*; do - binary=`basename $binary` + binary=$(basename $binary) rm -f $TERMUX_PREFIX/bin/$binary echo "export JAVA_HOME=\$PREFIX/$_jvm_dir" > $TERMUX_PREFIX/bin/$binary echo "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\$JAVA_HOME/lib:\$JAVA_HOME/lib/jli" >> $TERMUX_PREFIX/bin/$binary diff --git a/disabled-packages/unnethack/build.sh b/disabled-packages/unnethack/build.sh index 8f10131d8b..478589d5e2 100644 --- a/disabled-packages/unnethack/build.sh +++ b/disabled-packages/unnethack/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_DESCRIPTION="Dungeon crawling game, fork of NetHack" TERMUX_PKG_VERSION=5.1.0 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/unnethack/unnethack/${TERMUX_PKG_VERSION}/unnethack-${TERMUX_PKG_VERSION}-20131208.tar.gz # --with-owner=$USER to avoid unnethack trying to use a "games" user, --with-groups to avoid "bin" group -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-owner=$USER --with-group=`groups | cut -d ' ' -f 1`" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-owner=$USER --with-group=$(groups | cut -d ' ' -f 1)" TERMUX_PKG_DEPENDS="gsl, ncurses" # unnethack builds util/{makedefs,lev_comp,dgn_comp} binaries which are later used during the build. diff --git a/packages/apt/build.sh b/packages/apt/build.sh index 464fc3e800..c6b8fab757 100644 --- a/packages/apt/build.sh +++ b/packages/apt/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=1.4.9 TERMUX_PKG_SHA256=d4d65e7c84da86f3e6dcc933bba46a08db429c9d933b667c864f5c0e880bac0d TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --DPERL_EXECUTABLE=`which perl` +-DPERL_EXECUTABLE=$(which perl) -DCMAKE_INSTALL_FULL_LOCALSTATEDIR=$TERMUX_PREFIX -DCOMMON_ARCH=$TERMUX_ARCH -DDPKG_DATADIR=$TERMUX_PREFIX/share/dpkg diff --git a/packages/bash/build.sh b/packages/bash/build.sh index f4a8f0a5b2..b39c29cb94 100644 --- a/packages/bash/build.sh +++ b/packages/bash/build.sh @@ -55,7 +55,7 @@ termux_step_pre_configure() { PATCH_CHECKSUMS[022]=45331f0936e36ab91bfe44b936e33ed8a1b1848fa896e8a1d0f2ef74f297cb79 PATCH_CHECKSUMS[023]=4fec236f3fbd3d0c47b893fdfa9122142a474f6ef66c20ffb6c0f4864dd591b6 - for patch_number in `seq -f '%03g' ${_PATCH_VERSION}`; do + for patch_number in $(seq -f '%03g' ${_PATCH_VERSION}); do PATCHFILE=$TERMUX_PKG_CACHEDIR/bash_patch_${patch_number}.patch termux_download \ "https://mirrors.kernel.org/gnu/bash/bash-4.4-patches/bash44-$patch_number" \ diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh index da06ac73e1..de3abc78e6 100644 --- a/packages/busybox/build.sh +++ b/packages/busybox/build.sh @@ -33,7 +33,7 @@ termux_step_post_make_install() { rm -Rf $TERMUX_PREFIX/bin/applets mkdir -p $TERMUX_PREFIX/bin/applets cd $TERMUX_PREFIX/bin/applets - for f in `cat $TERMUX_PKG_SRCDIR/busybox.links`; do ln -s ../busybox `basename $f`; done + for f in $(cat $TERMUX_PKG_SRCDIR/busybox.links); do ln -s ../busybox $(basename $f); done # The 'env' applet is special in that it go into $PREFIX/bin: cd $TERMUX_PREFIX/bin diff --git a/packages/doxygen/build.sh b/packages/doxygen/build.sh index 116fdd91a6..e19514703c 100644 --- a/packages/doxygen/build.sh +++ b/packages/doxygen/build.sh @@ -6,10 +6,10 @@ TERMUX_PKG_VERSION=1.8.15 TERMUX_PKG_SHA256=bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/doxygen-$TERMUX_PKG_VERSION.src.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --DBISON_EXECUTABLE=`which bison` +-DBISON_EXECUTABLE=$(which bison) -DCMAKE_BUILD_TYPE=Release --DFLEX_EXECUTABLE=`which flex` --DPYTHON_EXECUTABLE=`which python3` +-DFLEX_EXECUTABLE=$(which flex) +-DPYTHON_EXECUTABLE=$(which python3) -Dbuild_parse=yes -Dbuild_xmlparser=yes " diff --git a/packages/ecj/build.sh b/packages/ecj/build.sh index b9f5b64e55..b9a0cc5e6f 100644 --- a/packages/ecj/build.sh +++ b/packages/ecj/build.sh @@ -39,7 +39,7 @@ termux_step_make() { jar uf ecj.jar org/eclipse/jdt/internal/compiler/messages.properties jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/parser/readableNames.props jar uf ecj.jar org/eclipse/jdt/internal/compiler/parser/readableNames.props - for i in `seq 1 24`; do + for i in $(seq 1 24); do jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/parser/parser$i.rsc jar uf ecj.jar org/eclipse/jdt/internal/compiler/parser/parser$i.rsc done diff --git a/packages/ecj4.6/build.sh b/packages/ecj4.6/build.sh index 4eefa9ff78..c547e95262 100644 --- a/packages/ecj4.6/build.sh +++ b/packages/ecj4.6/build.sh @@ -39,7 +39,7 @@ termux_step_make() { jar uf ecj.jar org/eclipse/jdt/internal/compiler/messages.properties jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/parser/readableNames.props jar uf ecj.jar org/eclipse/jdt/internal/compiler/parser/readableNames.props - for i in `seq 1 24`; do + for i in $(seq 1 24); do jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/parser/parser$i.rsc jar uf ecj.jar org/eclipse/jdt/internal/compiler/parser/parser$i.rsc done diff --git a/packages/git/build.sh b/packages/git/build.sh index 9858173b65..531df4e22b 100644 --- a/packages/git/build.sh +++ b/packages/git/build.sh @@ -43,7 +43,7 @@ share/man/man1/git-shell.1 termux_step_pre_configure() { # Setup perl so that the build process can execute it: rm -f $TERMUX_PREFIX/bin/perl - ln -s `which perl` $TERMUX_PREFIX/bin/perl + ln -s $(which perl) $TERMUX_PREFIX/bin/perl # Force fresh perl files (otherwise files from earlier builds # remains without bumped modification times, so are not picked diff --git a/packages/graphviz/build.sh b/packages/graphviz/build.sh index 57fc4ecd1c..4a159ffe31 100644 --- a/packages/graphviz/build.sh +++ b/packages/graphviz/build.sh @@ -40,7 +40,7 @@ termux_step_post_make_install() { # Some binaries (dot_builtins, gvpack) links against these: cd $TERMUX_PREFIX/lib for lib in graphviz/*.so.*; do - ln -s -f $lib `basename $lib` + ln -s -f $lib $(basename $lib) done } diff --git a/packages/imagemagick/build.sh b/packages/imagemagick/build.sh index 724847aa5e..742c3bc1d6 100644 --- a/packages/imagemagick/build.sh +++ b/packages/imagemagick/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Suite to create, edit, compose, or convert images in a v TERMUX_PKG_LICENSE="ImageMagick" TERMUX_PKG_VERSION=7.0.8.24 TERMUX_PKG_SHA256=6c1e7ca3601537b699ad26ba099e027cc86a92d7ae407f50d235c62b5d896322 -local _download_version=`echo $TERMUX_PKG_VERSION | sed 's/\(.*\)\./\1-/'` +local _download_version=$(echo $TERMUX_PKG_VERSION | sed 's/\(.*\)\./\1-/') TERMUX_PKG_SRCURL=https://github.com/ImageMagick/ImageMagick/archive/${_download_version}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-largefile diff --git a/packages/ldc/build.sh b/packages/ldc/build.sh index ec14894175..fb1d35356f 100644 --- a/packages/ldc/build.sh +++ b/packages/ldc/build.sh @@ -26,7 +26,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DLLVM_BUILD_TOOLS=OFF -DLLVM_BUILD_UTILS=OFF -DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen --DPYTHON_EXECUTABLE=`which python3` +-DPYTHON_EXECUTABLE=$(which python3) " TERMUX_PKG_KEEP_STATIC_LIBRARIES=true TERMUX_PKG_NO_DEVELSPLIT=yes diff --git a/packages/libcue/build.sh b/packages/libcue/build.sh index d423a415e9..85297a2bff 100644 --- a/packages/libcue/build.sh +++ b/packages/libcue/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_SHA256=f27bc3ebb2e892cd9d32a7bee6d84576a60f955f29f748b9b487b173712f12 TERMUX_PKG_SRCURL=https://github.com/lipnitsk/libcue/archive/v${TERMUX_PKG_VERSION}.tar.gz # To avoid picking up cross-compiled flex and bison: TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --DBISON_EXECUTABLE=`which bison` --DFLEX_EXECUTABLE=`which flex` +-DBISON_EXECUTABLE=$(which bison) +-DFLEX_EXECUTABLE=$(which flex) -DBUILD_SHARED_LIBS=ON " diff --git a/packages/libgrpc/build.sh b/packages/libgrpc/build.sh index 37d1a32eac..f6393bb720 100644 --- a/packages/libgrpc/build.sh +++ b/packages/libgrpc/build.sh @@ -8,8 +8,8 @@ TERMUX_PKG_BUILD_DEPENDS="libprotobuf" TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --DCMAKE_STRIP=`which strip` --DGIT_EXECUTABLE=`which git` +-DCMAKE_STRIP=$(which strip) +-DGIT_EXECUTABLE=$(which git) -DBUILD_SHARED_LIBS=ON -DgRPC_CARES_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh index 3fd5aa9032..4361fcbd69 100644 --- a/packages/libllvm/build.sh +++ b/packages/libllvm/build.sh @@ -27,7 +27,7 @@ TERMUX_PKG_CONFLICTS="gcc, clang (<< 3.9.1-3)" TERMUX_PKG_REPLACES=gcc # See http://llvm.org/docs/CMake.html: TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --DPYTHON_EXECUTABLE=`which python3` +-DPYTHON_EXECUTABLE=$(which python3) -DLLVM_ENABLE_PIC=ON -DLLVM_ENABLE_LIBEDIT=OFF -DLLVM_BUILD_TESTS=OFF diff --git a/packages/libpulseaudio/build.sh b/packages/libpulseaudio/build.sh index 7c4613e138..9ac649ce54 100644 --- a/packages/libpulseaudio/build.sh +++ b/packages/libpulseaudio/build.sh @@ -53,7 +53,7 @@ termux_step_post_make_install() { # Some binaries link against these: cd $TERMUX_PREFIX/lib for lib in pulseaudio/lib*.so* pulse-${TERMUX_PKG_VERSION}/modules/lib*.so*; do - ln -s -f $lib `basename $lib` + ln -s -f $lib $(basename $lib) done # Pulseaudio fails to start when it cannot detect any sound hardware diff --git a/packages/librsync/build.sh b/packages/librsync/build.sh index 26bb9c00b1..3b223fd35b 100644 --- a/packages/librsync/build.sh +++ b/packages/librsync/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_SHA256=e67b9520ee84f7239be6e948795803bd95495091cc00bf6d0e8c6976032a4a TERMUX_PKG_SRCURL=https://github.com/librsync/librsync/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libbz2" TERMUX_PKG_BUILD_DEPENDS="libpopt" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DPERL_EXECUTABLE=`which perl`" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DPERL_EXECUTABLE=$(which perl)" termux_step_pre_configure() { # Remove old files to ensure new timestamps on symlinks: diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh index e9eefd9e8c..34a5f20488 100644 --- a/packages/mariadb/build.sh +++ b/packages/mariadb/build.sh @@ -6,11 +6,11 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=f7449a34c25e0455928d7983dae83fd2069fe1f16c4c5f4aeed9ed9d3f081ff6 TERMUX_PKG_SRCURL=https://ftp.osuosl.org/pub/mariadb/mariadb-$TERMUX_PKG_VERSION/source/mariadb-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --DBISON_EXECUTABLE=`which bison` --DGETCONF=`which getconf` +-DBISON_EXECUTABLE=$(which bison) +-DGETCONF=$(which getconf) -DBUILD_CONFIG=mysql_release --DCAT_EXECUTABLE=`which cat` --DGIT_EXECUTABLE=`which git` +-DCAT_EXECUTABLE=$(which cat) +-DGIT_EXECUTABLE=$(which git) -DGSSAPI_FOUND=NO -DGRN_WITH_LZ4=no -DENABLED_LOCAL_INFILE=ON @@ -85,7 +85,7 @@ termux_step_create_debscripts() { echo "if [ ! -e "$TERMUX_PREFIX/var/lib/mysql" ]; then" > postinst echo " echo 'Initializing mysql data directory...'" >> postinst echo " mkdir -p $TERMUX_PREFIX/var/lib/mysql" >> postinst - echo " $TERMUX_PREFIX/bin/mysql_install_db --user=\`whoami\` --datadir=$TERMUX_PREFIX/var/lib/mysql --basedir=$TERMUX_PREFIX" >> postinst + echo " $TERMUX_PREFIX/bin/mysql_install_db --user=$(whoami) --datadir=$TERMUX_PREFIX/var/lib/mysql --basedir=$TERMUX_PREFIX" >> postinst echo "fi" >> postinst echo "exit 0" >> postinst chmod 0755 postinst diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh index 1d0e4a8a83..58a3b1c57a 100644 --- a/packages/neovim/build.sh +++ b/packages/neovim/build.sh @@ -9,12 +9,12 @@ TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DENABLE_JEMALLOC=OFF --DGETTEXT_MSGFMT_EXECUTABLE=`which msgfmt` --DGETTEXT_MSGMERGE_EXECUTABLE=`which msgmerge` +-DGETTEXT_MSGFMT_EXECUTABLE=$(which msgfmt) +-DGETTEXT_MSGMERGE_EXECUTABLE=$(which msgmerge) -DGPERF_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/gperf -DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit --DPKG_CONFIG_EXECUTABLE=`which pkg-config` --DXGETTEXT_PRG=`which xgettext` +-DPKG_CONFIG_EXECUTABLE=$(which pkg-config) +-DXGETTEXT_PRG=$(which xgettext) -DPREFER_LUA=ON -DLUA_INCLUDE_DIR=$TERMUX_PREFIX/include " diff --git a/packages/openssh/source-ssh-agent.sh b/packages/openssh/source-ssh-agent.sh index 6b0a6f86fc..e3a37ab6f8 100644 --- a/packages/openssh/source-ssh-agent.sh +++ b/packages/openssh/source-ssh-agent.sh @@ -15,7 +15,7 @@ start_agent() { ssh-add } -MESSAGE=`ssh-add -L 2>&1` +MESSAGE=$(ssh-add -L 2>&1) if [ "$MESSAGE" = 'Could not open a connection to your authentication agent.' -o \ "$MESSAGE" = 'Error connecting to agent: Connection refused' -o \ "$MESSAGE" = 'Error connecting to agent: No such file or directory' ]; then diff --git a/packages/readline/build.sh b/packages/readline/build.sh index de63facdf9..d60ed6ea27 100644 --- a/packages/readline/build.sh +++ b/packages/readline/build.sh @@ -19,7 +19,7 @@ termux_step_pre_configure() { PATCH_CHECKSUMS[3]=9e43aa93378c7e9f7001d8174b1beb948deefa6799b6f581673f465b7d9d4780 PATCH_CHECKSUMS[4]=f925683429f20973c552bff6702c74c58c2a38ff6e5cf305a8e847119c5a6b64 PATCH_CHECKSUMS[5]=ca159c83706541c6bbe39129a33d63bbd76ac594303f67e4d35678711c51b753 - for patch_number in `seq -f '%03g' ${_PATCH_VERSION}`; do + for patch_number in $(seq -f '%03g' ${_PATCH_VERSION}); do PATCHFILE=$TERMUX_PKG_CACHEDIR/readline_patch_${patch_number}.patch termux_download \ "https://mirrors.kernel.org/gnu/readline/readline-7.0-patches/readline70-$patch_number" \ diff --git a/packages/ripgrep/build.sh b/packages/ripgrep/build.sh index 827e393309..e7230dd048 100644 --- a/packages/ripgrep/build.sh +++ b/packages/ripgrep/build.sh @@ -10,15 +10,15 @@ TERMUX_PKG_BUILD_IN_SRC=yes termux_step_post_make_install() { # Install man page: mkdir -p $TERMUX_PREFIX/share/man/man1/ - cp `find . -name rg.1` $TERMUX_PREFIX/share/man/man1/ + cp $(find . -name rg.1) $TERMUX_PREFIX/share/man/man1/ # Install bash completion script: mkdir -p $TERMUX_PREFIX/share/bash-completion/completions/ - cp `find . -name rg.bash` $TERMUX_PREFIX/share/bash-completion/completions/rg + cp $(find . -name rg.bash) $TERMUX_PREFIX/share/bash-completion/completions/rg # Install fish completion script: mkdir -p $TERMUX_PREFIX/share/fish/completions/ - cp `find . -name rg.fish` $TERMUX_PREFIX/share/fish/completions/ + cp $(find . -name rg.fish) $TERMUX_PREFIX/share/fish/completions/ # Install zsh completion script: mkdir -p $TERMUX_PREFIX/share/zsh/site-functions/ diff --git a/packages/ruby/tests/default_encoding_isutf8.sh b/packages/ruby/tests/default_encoding_isutf8.sh index 87796c157a..46f26cf0a6 100644 --- a/packages/ruby/tests/default_encoding_isutf8.sh +++ b/packages/ruby/tests/default_encoding_isutf8.sh @@ -1 +1 @@ -assert_equals '#' `ruby -e 'p Encoding.default_external'` +assert_equals '#' $(ruby -e 'p Encoding.default_external') diff --git a/packages/rust/build.sh b/packages/rust/build.sh index e40e0d9662..5ae4f9964b 100644 --- a/packages/rust/build.sh +++ b/packages/rust/build.sh @@ -26,7 +26,7 @@ termux_step_configure() { | sed "s%\\@CARGO\\@%$CARGO%g" \ > config.toml - local env_host=`printf $CARGO_TARGET_NAME | tr a-z A-Z | sed s/-/_/g` + local env_host=$(printf $CARGO_TARGET_NAME | tr a-z A-Z | sed s/-/_/g) export LD_LIBRARY_PATH=$TERMUX_PKG_BUILDDIR/build/x86_64-unknown-linux-gnu/llvm/lib export ${env_host}_OPENSSL_DIR=$TERMUX_PREFIX diff --git a/packages/serf/build.sh b/packages/serf/build.sh index f4f43ae300..5a32f3832b 100644 --- a/packages/serf/build.sh +++ b/packages/serf/build.sh @@ -11,7 +11,7 @@ TERMUX_PKG_BUILD_IN_SRC=yes termux_step_make_install() { scons APR=$TERMUX_PREFIX \ APU=$TERMUX_PREFIX \ - CC=`which $CC` \ + CC=$(which $CC) \ CFLAGS="$CFLAGS" \ CPPFLAGS="$CPPFLAGS -std=c11" \ LINKFLAGS="$LDFLAGS" \ diff --git a/packages/tcl/build.sh b/packages/tcl/build.sh index 3bbaeb810a..81e09c4c01 100644 --- a/packages/tcl/build.sh +++ b/packages/tcl/build.sh @@ -44,7 +44,7 @@ termux_step_post_make_install() { -shared \ $TERMUX_PREFIX/src/libsqlite/tclsqlite3.c \ -ltcl$_MAJOR_VERSION -lsqlite3 - local LIBSQLITE_VERSION=`$PKG_CONFIG --modversion sqlite3` + local LIBSQLITE_VERSION=$($PKG_CONFIG --modversion sqlite3) echo "package ifneeded sqlite3 $LIBSQLITE_VERSION [list load [file join \$dir libtclsqlite3.so] Sqlite3]" > \ $NEW_LIBDIR/pkgIndex.tcl } diff --git a/packages/weechat/build.sh b/packages/weechat/build.sh index a0374c1a0a..e435ba9f04 100644 --- a/packages/weechat/build.sh +++ b/packages/weechat/build.sh @@ -14,8 +14,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DENABLE_PERL=ON -DENABLE_PYTHON3=ON -DENABLE_TCL=OFF --DMSGFMT_EXECUTABLE=`which msgfmt` --DMSGMERGE_EXECUTABLE=`which msgmerge` --DPKG_CONFIG_EXECUTABLE=`which pkg-config` --DXGETTEXT_EXECUTABLE=`which xgettext` +-DMSGFMT_EXECUTABLE=$(which msgfmt) +-DMSGMERGE_EXECUTABLE=$(which msgmerge) +-DPKG_CONFIG_EXECUTABLE=$(which pkg-config) +-DXGETTEXT_EXECUTABLE=$(which xgettext) " diff --git a/scripts/check-versions.sh b/scripts/check-versions.sh index bdc1d4ef5e..359ee27679 100755 --- a/scripts/check-versions.sh +++ b/scripts/check-versions.sh @@ -2,11 +2,11 @@ # check-versions.sh - script to open packages in a browser for checking their versions OPEN=xdg-open -if [ `uname` = Darwin ]; then OPEN=open; fi +if [ $(uname) = Darwin ]; then OPEN=open; fi check_package() { # path local path=$1 - local pkg=`basename $path` + local pkg=$(basename $path) . $path/build.sh echo -n "$pkg - $TERMUX_PKG_VERSION" read diff --git a/scripts/generate-repology-metadata.sh b/scripts/generate-repology-metadata.sh index 409a3897e6..81b9a4ce35 100755 --- a/scripts/generate-repology-metadata.sh +++ b/scripts/generate-repology-metadata.sh @@ -3,19 +3,19 @@ set -e check_package() { # path - # Avoid ending on errors such as `which prog` + # Avoid ending on errors such as $(which prog) # where prog is not installed. set +e local path=$1 - local pkg=`basename $path` + local pkg=$(basename $path) TERMUX_PKG_MAINTAINER="Fredrik Fornwall @fornwall" . $path/build.sh echo " {" echo " \"name\": \"$pkg\"," echo " \"version\": \"$TERMUX_PKG_VERSION\"," - DESC=`echo $TERMUX_PKG_DESCRIPTION | head -n 1` + DESC=$(echo $TERMUX_PKG_DESCRIPTION | head -n 1) echo " \"description\": \"$DESC\"," echo " \"homepage\": \"$TERMUX_PKG_HOMEPAGE\"," diff --git a/scripts/list-packages.sh b/scripts/list-packages.sh index 57c437ce5e..1ff8665ac6 100755 --- a/scripts/list-packages.sh +++ b/scripts/list-packages.sh @@ -3,7 +3,7 @@ show_package() { . $1/build.sh - local pkg=`basename $1` + local pkg=$(basename $1) echo "$pkg($TERMUX_PKG_VERSION): $TERMUX_PKG_HOMEPAGE" echo " $TERMUX_PKG_DESCRIPTION" } diff --git a/scripts/list-versions.sh b/scripts/list-versions.sh index c7b07e35dc..187e5cf468 100755 --- a/scripts/list-versions.sh +++ b/scripts/list-versions.sh @@ -4,7 +4,7 @@ check_package() { # path local path=$1 - local pkg=`basename $path` + local pkg=$(basename $path) TERMUX_PKG_REVISION=0 TERMUX_ARCH=aarch64 . $path/build.sh diff --git a/scripts/setup-android-sdk.sh b/scripts/setup-android-sdk.sh index e974eb316f..73c07b8e28 100755 --- a/scripts/setup-android-sdk.sh +++ b/scripts/setup-android-sdk.sh @@ -12,7 +12,7 @@ ANDROID_NDK_SHA256=c413dd014edc37f822d0dc88fabc05b64232d07d5c6e9345224e47073fdf1 if [ ! -d $ANDROID_HOME ]; then mkdir -p $ANDROID_HOME cd $ANDROID_HOME/.. - rm -Rf `basename $ANDROID_HOME` + rm -Rf $(basename $ANDROID_HOME) # https://developer.android.com/studio/index.html#command-tools # The downloaded version below is 26.1.1.: @@ -29,14 +29,14 @@ fi if [ ! -d $NDK ]; then mkdir -p $NDK cd $NDK/.. - rm -Rf `basename $NDK` + rm -Rf $(basename $NDK) echo "Downloading android ndk..." curl --fail --retry 3 -o ndk.zip \ https://dl.google.com/android/repository/${ANDROID_NDK_FILE} echo "${ANDROID_NDK_SHA256} ndk.zip" | sha256sum -c - rm -Rf android-ndk-r$TERMUX_NDK_VERSION unzip -q ndk.zip - mv android-ndk-r$TERMUX_NDK_VERSION `basename $NDK` + mv android-ndk-r$TERMUX_NDK_VERSION $(basename $NDK) rm ndk.zip fi diff --git a/scripts/setup-archlinux.sh b/scripts/setup-archlinux.sh index ef79ffe745..63f45d5e1b 100755 --- a/scripts/setup-archlinux.sh +++ b/scripts/setup-archlinux.sh @@ -38,6 +38,6 @@ PACKAGES+=" gperf" # Needed by fontconfig sudo pacman -Syq --noconfirm $PACKAGES sudo mkdir -p /data/data/com.termux/files/usr -sudo chown -R `whoami` /data +sudo chown -R $(whoami) /data echo "Please also install ncurses5-compat-libs and makedepend packages from the AUR before continuing" diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index 160c92b75e..b2a8bdd8d3 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -44,4 +44,4 @@ sudo DEBIAN_FRONTEND=noninteractive \ apt-get install -yq --no-install-recommends $PACKAGES sudo mkdir -p /data/data/com.termux/files/usr -sudo chown -R `whoami` /data +sudo chown -R $(whoami) /data diff --git a/scripts/update-docker.sh b/scripts/update-docker.sh index ef46f255a6..0244274dd7 100755 --- a/scripts/update-docker.sh +++ b/scripts/update-docker.sh @@ -6,8 +6,8 @@ IMAGE=termux/package-builder docker pull $IMAGE -LATEST=`docker inspect --format "{{.Id}}" $IMAGE` -RUNNING=`docker inspect --format "{{.Image}}" $CONTAINER` +LATEST=$(docker inspect --format "{{.Id}}" $IMAGE) +RUNNING=$(docker inspect --format "{{.Image}}" $CONTAINER) if [ $LATEST = $RUNNING ]; then echo "Image '$IMAGE' used in the container '$CONTAINER' is already up to date"