Browse Source

Move termux-user from termux-api to termux-tools

Also add a am wrapper script which clears
LD_LIBRARY_PATH before calling /system/bin/am.
android-5
Fredrik Fornwall 10 years ago
parent
commit
a0010caca3
  1. 2
      packages/termux-api/build.sh
  2. 6
      packages/termux-tools/am
  3. 6
      packages/termux-tools/build.sh
  4. 0
      packages/termux-tools/termux-user

2
packages/termux-api/build.sh

@ -1,6 +1,6 @@
TERMUX_PKG_HOMEPAGE=http://termux.com/add-ons/api/ TERMUX_PKG_HOMEPAGE=http://termux.com/add-ons/api/
TERMUX_PKG_DESCRIPTION="Termux API commands" TERMUX_PKG_DESCRIPTION="Termux API commands"
TERMUX_PKG_VERSION=0.4.50 TERMUX_PKG_VERSION=0.4.51
termux_step_make_install () { termux_step_make_install () {
mkdir -p $TERMUX_PREFIX/bin mkdir -p $TERMUX_PREFIX/bin

6
packages/termux-tools/am

@ -0,0 +1,6 @@
#!@TERMUX_PREFIX@/bin/sh
# Remove LD_LIBRARY_PATH from environment to avoid conflicting
# with system libraries that am may link against.
LD_LIBRARY_PATH= /system/bin/am $@

6
packages/termux-tools/build.sh

@ -1,12 +1,12 @@
TERMUX_PKG_HOMEPAGE=http://termux.com/ TERMUX_PKG_HOMEPAGE=http://termux.com/
TERMUX_PKG_DESCRIPTION="Some tools for Termux" TERMUX_PKG_DESCRIPTION="Some tools for Termux"
TERMUX_PKG_VERSION=0.3 TERMUX_PKG_VERSION=0.5
termux_step_make_install () { termux_step_make_install () {
$CXX $CFLAGS $LDFLAGS -std=c++14 $TERMUX_PKG_BUILDER_DIR/*.cpp -o $TERMUX_PREFIX/bin/termux-elf-cleaner $CXX $CFLAGS $LDFLAGS -std=c++14 $TERMUX_PKG_BUILDER_DIR/*.cpp -o $TERMUX_PREFIX/bin/termux-elf-cleaner
rm -f $TERMUX_PREFIX/bin/{termux-fix-shebang,termux-reload-style,chsh,termux-open-url} rm -f $TERMUX_PREFIX/bin/{am,termux-user,termux-fix-shebang,termux-reload-style,chsh,termux-open-url}
cp $TERMUX_PKG_BUILDER_DIR/{termux-fix-shebang,termux-reload-style,chsh,termux-open-url} $TERMUX_PREFIX/bin/ cp $TERMUX_PKG_BUILDER_DIR/{am,termux-user,termux-fix-shebang,termux-reload-style,chsh,termux-open-url} $TERMUX_PREFIX/bin/
sed -i "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/termux-fix-shebang sed -i "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/termux-fix-shebang
} }

0
packages/termux-api/termux-user → packages/termux-tools/termux-user

Loading…
Cancel
Save