revert this mess
This commit is contained in:
parent
69028bfb72
commit
5ed8471923
|
@ -1,7 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# check-pie.sh - script to detect non-PIE binaries (which does not work on Android)
|
# check-pie.sh - script to detect non-PIE binaries (which does not work on Android)
|
||||||
|
|
||||||
: "${TERMUX_SCRIPTDIR:="$(realpath "$(dirname "$(readlink -f "$0")")/../..")"}"
|
|
||||||
. $(dirname "$(realpath "$0")")/properties.sh
|
. $(dirname "$(realpath "$0")")/properties.sh
|
||||||
|
|
||||||
cd ${TERMUX_PREFIX}/bin
|
cd ${TERMUX_PREFIX}/bin
|
||||||
|
|
|
@ -12,7 +12,6 @@ version=0.1.0
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
: "${TERMUX_SCRIPTDIR:="$(realpath "$(dirname "$(readlink -f "$0")")/..")"}"
|
|
||||||
. $(dirname "$(realpath "$0")")/properties.sh
|
. $(dirname "$(realpath "$0")")/properties.sh
|
||||||
|
|
||||||
BOOTSTRAP_TMPDIR=$(mktemp -d "${TMPDIR:-/tmp}/bootstrap-tmp.XXXXXXXX")
|
BOOTSTRAP_TMPDIR=$(mktemp -d "${TMPDIR:-/tmp}/bootstrap-tmp.XXXXXXXX")
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
: "${TERMUX_SCRIPTDIR:="$(realpath "$(dirname "$(readlink -f "$0")")/..")"}"
|
|
||||||
. $(dirname "$(realpath "$0")")/properties.sh
|
. $(dirname "$(realpath "$0")")/properties.sh
|
||||||
BOOTSTRAP_TMPDIR=$(mktemp -d "${TMPDIR:-/tmp}/bootstrap-tmp.XXXXXXXX")
|
BOOTSTRAP_TMPDIR=$(mktemp -d "${TMPDIR:-/tmp}/bootstrap-tmp.XXXXXXXX")
|
||||||
trap 'rm -rf $BOOTSTRAP_TMPDIR' EXIT
|
trap 'rm -rf $BOOTSTRAP_TMPDIR' EXIT
|
||||||
|
|
|
@ -115,7 +115,6 @@ lint_package() {
|
||||||
TERMUX_PKG_API_LEVEL=24
|
TERMUX_PKG_API_LEVEL=24
|
||||||
|
|
||||||
if [ -f "$REPO_DIR/scripts/properties.sh" ]; then
|
if [ -f "$REPO_DIR/scripts/properties.sh" ]; then
|
||||||
: "${TERMUX_SCRIPTDIR:=$REPO_DIR}"
|
|
||||||
. "$REPO_DIR/scripts/properties.sh"
|
. "$REPO_DIR/scripts/properties.sh"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
SCRIPT_DIR=$(dirname "$(realpath "$0")")
|
SCRIPT_DIR=$(dirname "$(realpath "$0")")
|
||||||
: "${TERMUX_SCRIPTDIR:="$(realpath "$SCRIPT_DIR/..")"}"
|
|
||||||
. "$SCRIPT_DIR"/properties.sh
|
. "$SCRIPT_DIR"/properties.sh
|
||||||
|
|
||||||
check_package() { # path
|
check_package() { # path
|
||||||
|
|
|
@ -3,8 +3,6 @@
|
||||||
# coreutils and are clearly not a default part of most Linux installations,
|
# coreutils and are clearly not a default part of most Linux installations,
|
||||||
# or sourcing any other script in our build directories.
|
# or sourcing any other script in our build directories.
|
||||||
|
|
||||||
: "${TERMUX_SCRIPTDIR:?TERMUX_SCRIPTDIR not set for properties.sh}"
|
|
||||||
|
|
||||||
TERMUX_SDK_REVISION=9123335
|
TERMUX_SDK_REVISION=9123335
|
||||||
TERMUX_ANDROID_BUILD_TOOLS_VERSION=33.0.1
|
TERMUX_ANDROID_BUILD_TOOLS_VERSION=33.0.1
|
||||||
# when changing the above:
|
# when changing the above:
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
set -e -u
|
set -e -u
|
||||||
|
|
||||||
: "${TERMUX_PKG_TMPDIR:="/tmp"}"
|
: "${TERMUX_PKG_TMPDIR:="/tmp"}"
|
||||||
: "${TERMUX_SCRIPTDIR:="$(realpath "$(dirname "$(readlink -f "$0")")/..")"}"
|
|
||||||
|
|
||||||
# Install desired parts of the Android SDK:
|
# Install desired parts of the Android SDK:
|
||||||
. $(cd "$(dirname "$0")"; pwd)/properties.sh
|
. $(cd "$(dirname "$0")"; pwd)/properties.sh
|
||||||
|
|
|
@ -52,7 +52,6 @@ else
|
||||||
fi
|
fi
|
||||||
$SUDO pacman -Syq --needed --noconfirm $PACKAGES
|
$SUDO pacman -Syq --needed --noconfirm $PACKAGES
|
||||||
|
|
||||||
: "${TERMUX_SCRIPTDIR:="$(realpath "$(dirname "$(readlink -f "$0")")/..")"}"
|
|
||||||
. $(dirname "$(realpath "$0")")/properties.sh
|
. $(dirname "$(realpath "$0")")/properties.sh
|
||||||
$SUDO mkdir -p $TERMUX_PREFIX
|
$SUDO mkdir -p $TERMUX_PREFIX
|
||||||
$SUDO chown -R $(whoami) /data
|
$SUDO chown -R $(whoami) /data
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
# setup CGCT - Cross Gnu Compiler for Termux
|
# setup CGCT - Cross Gnu Compiler for Termux
|
||||||
# compile glibc-based binaries for Termux
|
# compile glibc-based binaries for Termux
|
||||||
|
|
||||||
: "${TERMUX_SCRIPTDIR:="$(realpath "$(dirname "$(readlink -f "$0")")/..")"}"
|
|
||||||
. $(dirname "$(realpath "$0")")/properties.sh
|
. $(dirname "$(realpath "$0")")/properties.sh
|
||||||
. $(dirname "$(realpath "$0")")/build/termux_download.sh
|
. $(dirname "$(realpath "$0")")/build/termux_download.sh
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
: "${TERMUX_SCRIPTDIR:="$(realpath "$(dirname "$(readlink -f "$0")")/..")"}"
|
|
||||||
. $(dirname "$(realpath "$0")")/properties.sh
|
. $(dirname "$(realpath "$0")")/properties.sh
|
||||||
source "$TERMUX_PREFIX/bin/termux-setup-package-manager" || true
|
source "$TERMUX_PREFIX/bin/termux-setup-package-manager" || true
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,6 @@ PACKAGES+=" xmlto" # Needed by git's manpage generation
|
||||||
PACKAGES+=" zip"
|
PACKAGES+=" zip"
|
||||||
|
|
||||||
# Definition of a package manager
|
# Definition of a package manager
|
||||||
: "${TERMUX_SCRIPTDIR:="$(realpath "$(dirname "$(readlink -f "$0")")/..")"}"
|
|
||||||
. $(dirname "$(realpath "$0")")/properties.sh
|
. $(dirname "$(realpath "$0")")/properties.sh
|
||||||
source "$TERMUX_PREFIX/bin/termux-setup-package-manager" || true
|
source "$TERMUX_PREFIX/bin/termux-setup-package-manager" || true
|
||||||
|
|
||||||
|
|
|
@ -323,7 +323,6 @@ rm -f /tmp/py2-get-pip.py
|
||||||
$SUDO locale-gen --purge en_US.UTF-8
|
$SUDO locale-gen --purge en_US.UTF-8
|
||||||
echo -e 'LANG="en_US.UTF-8"\nLANGUAGE="en_US:en"\n' | $SUDO tee -a /etc/default/locale
|
echo -e 'LANG="en_US.UTF-8"\nLANGUAGE="en_US:en"\n' | $SUDO tee -a /etc/default/locale
|
||||||
|
|
||||||
: "${TERMUX_SCRIPTDIR:="$(realpath "$(dirname "$(readlink -f "$0")")/..")"}"
|
|
||||||
. $(dirname "$(realpath "$0")")/properties.sh
|
. $(dirname "$(realpath "$0")")/properties.sh
|
||||||
$SUDO mkdir -p $TERMUX_PREFIX
|
$SUDO mkdir -p $TERMUX_PREFIX
|
||||||
$SUDO chown -R $(whoami) /data
|
$SUDO chown -R $(whoami) /data
|
||||||
|
|
Loading…
Reference in New Issue