Browse Source

termux-upgrade-repo: fix shebang, and only install packages that are installable

Use comm to get intersection of packages_to_install and installable_packages. Works with both busybox and coreutils comm.
android-5
Henrik Grimler 6 years ago
committed by Fredrik Fornwall
parent
commit
7371567d4a
  1. 2
      packages/termux-tools/build.sh
  2. 7
      packages/termux-tools/termux-upgrade-repo

2
packages/termux-tools/build.sh

@ -1,7 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://termux.com/
TERMUX_PKG_DESCRIPTION="Basic system tools for Termux"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_VERSION=0.66
TERMUX_PKG_VERSION=0.67
TERMUX_PKG_PLATFORM_INDEPENDENT=yes
TERMUX_PKG_ESSENTIAL=yes
TERMUX_PKG_DEPENDS="termux-am"

7
packages/termux-tools/termux-upgrade-repo

@ -14,7 +14,7 @@ echo Ok
BACKUP_SCRIPT=$HOME/termux-reinstall.sh
echo -n "Creating backup script ~/termux-reinstall.sh ... "
echo '#!/data/data/com.termux/files/usr/sh' > $BACKUP_SCRIPT
echo "#!$PREFIX/bin/bash" > $BACKUP_SCRIPT
REPOS_TO_INSTALL=""
for REPO in ${REPOS_TO_CHECK}; do
@ -32,9 +32,12 @@ done
if [ ! -z "REPOS_TO_INSTALL" ]; then
echo "pkg in $REPOS_TO_INSTALL" >> $BACKUP_SCRIPT
else
echo "apt update" >> $BACKUP_SCRIPT
fi
echo pkg install `dpkg-query -f '${binary:Package}\n' -W` >> $BACKUP_SCRIPT
echo "PACKAGES_TO_INSTALL=\"$(dpkg-query -f '${binary:Package}\n' -W)\"" >> $BACKUP_SCRIPT
echo 'apt install $(comm -12 <(echo "${PACKAGES_TO_INSTALL}") <(dpkg-query -f '"'"'${binary:Package}\\n'"'"' -W))' >> $BACKUP_SCRIPT
chmod +x $BACKUP_SCRIPT
echo Ok
echo ''

Loading…
Cancel
Save