From f643ff600c4671c1e92f6fb20263fab924b5c41f Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Mon, 27 Jul 2015 17:20:14 -0400 Subject: [PATCH] Teach build-package.sh to take path to packages --- build-package.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/build-package.sh b/build-package.sh index 13f8650f..f7da4993 100755 --- a/build-package.sh +++ b/build-package.sh @@ -2,12 +2,20 @@ set -e -o pipefail -u -if [ "$#" -ne 1 ]; then echo "ERROR: Specify one argument!"; exit 1; fi -export TERMUX_PKG_NAME=$1 +if [ "$#" -ne 1 ]; then echo "ERROR: Specify one argument (name of or path to package)"; exit 1; fi +export TERMUX_PKG_NAME=`basename $1` export TERMUX_SCRIPTDIR=`cd $(dirname $0); pwd` -export TERMUX_PKG_BUILDER_DIR=$TERMUX_SCRIPTDIR/packages/$TERMUX_PKG_NAME + +if [[ $1 == *"/"* ]]; then + # Path to directory which may be outside this repo: + if [ ! -d $1 ]; then echo "ERROR: '$1' seems to be a path but is not a directory"; exit 1; fi + export TERMUX_PKG_BUILDER_DIR=`realpath $1` +else + # Package name: + export TERMUX_PKG_BUILDER_DIR=$TERMUX_SCRIPTDIR/packages/$TERMUX_PKG_NAME +fi export TERMUX_PKG_BUILDER_SCRIPT=$TERMUX_PKG_BUILDER_DIR/build.sh -if test ! -f $TERMUX_PKG_BUILDER_SCRIPT; then echo "ERROR: No such package builder: ${TERMUX_PKG_BUILDER_SCRIPT}!"; exit 1; fi +if test ! -f $TERMUX_PKG_BUILDER_SCRIPT; then echo "ERROR: No build.sh script at supposed package dir $TERMUX_PKG_BUILDER_DIR!"; exit 1; fi echo "termux - building $1..." test -t 1 && printf "\033]0;$1...\007" -- 2.11.0