termux-api: Cleanup and put termux-api binary in libexec

diff --git a/packages/termux-api/build.sh b/packages/termux-api/build.sh
index e79016c06af6f3f5189125d2b9e28faba97f0983..4cbb64ee7cdf410a1ff59d96b483a11e0f94c9b1 100644 (file)
--- a/packages/termux-api/build.sh
+++ b/packages/termux-api/build.sh
@@ -1,11 +1,14 @@
 TERMUX_PKG_HOMEPAGE=http://termux.com/add-ons/api/
 TERMUX_PKG_DESCRIPTION="Termux API commands"
 TERMUX_PKG_HOMEPAGE=http://termux.com/add-ons/api/
 TERMUX_PKG_DESCRIPTION="Termux API commands"

-TERMUX_PKG_VERSION=0.7
+TERMUX_PKG_VERSION=0.8

 
 termux_step_make_install () {
         mkdir -p $TERMUX_PREFIX/bin
 
 termux_step_make_install () {
         mkdir -p $TERMUX_PREFIX/bin

-        for file in `ls $TERMUX_PKG_BUILDER_DIR/* | grep -v build.sh | grep -v termux-api.c`; do
-               cp $file $TERMUX_PREFIX/bin
+       local TERMUX_API_BINARY=$TERMUX_PREFIX/libexec/termux-api
+       cd $TERMUX_PKG_BUILDER_DIR
+        for file in `ls termux-* | grep -v termux-api.c`; do
+               sed "s|@TERMUX_API@|$TERMUX_API_BINARY|" $file > $TERMUX_PREFIX/bin/$file
+               chmod +x $TERMUX_PREFIX/bin/$file

         done
         done

-        $CC $CFLAGS -std=c11 -Wall -Wextra -pedantic -Werror $LDFLAGS $TERMUX_PKG_BUILDER_DIR/termux-api.c -o $TERMUX_PREFIX/bin/termux-api
+        $CC $CFLAGS -std=c11 -Wall -Wextra -pedantic -Werror $LDFLAGS termux-api.c -o $TERMUX_API_BINARY

 }
 }

diff --git a/packages/termux-api/termux-battery-status b/packages/termux-api/termux-battery-status
index 3a457eaa9bb75cda92156bcc98e8ecfe40287004..4441d48af4a0b50d90494d124d274398114036a0 100755 (executable)
--- a/packages/termux-api/termux-battery-status
+++ b/packages/termux-api/termux-battery-status
@@ -1,4 +1,4 @@
-#!/system/bin/sh
+#!/bin/sh

 
 if [ "$#" != "0" ]; then
        echo "usage: termux-battery-status"
 
 if [ "$#" != "0" ]; then
        echo "usage: termux-battery-status"


@@ -6,4 +6,4 @@ if [ "$#" != "0" ]; then
        exit 1
 fi
 
        exit 1
 fi
 

-termux-api BatteryStatus
+@TERMUX_API@ BatteryStatus

diff --git a/packages/termux-api/termux-camera-info b/packages/termux-api/termux-camera-info
index cdd16ca991e14e9ec3f448c31943b9da716b84a8..ec6bda1f740f4d6389c70909662d472128671061 100755 (executable)
--- a/packages/termux-api/termux-camera-info
+++ b/packages/termux-api/termux-camera-info
@@ -1,3 +1,3 @@
-#!/system/bin/sh
+#!/bin/sh

 
 

-termux-api CameraInfo
+@TERMUX_API@ CameraInfo

diff --git a/packages/termux-api/termux-camera-photo b/packages/termux-api/termux-camera-photo
index 08f44516ec30b4d0348fe79f16511ff1bcb6adb8..bdb27a5aa8f4d09eec97a5d0eed27b7c48a5c35a 100755 (executable)
--- a/packages/termux-api/termux-camera-photo
+++ b/packages/termux-api/termux-camera-photo
@@ -1,4 +1,4 @@
-#!/system/bin/sh
+#!/bin/sh

 
 set -e -u
 
 
 set -e -u
 


@@ -28,4 +28,4 @@ if [ $# != 1 ]; then show_usage; exit 1; fi
 touch $1
 PARAMS="$PARAMS --es file `realpath $1`"
 
 touch $1
 PARAMS="$PARAMS --es file `realpath $1`"
 

-termux-api CameraPhoto $PARAMS
+@TERMUX_API@ CameraPhoto $PARAMS

diff --git a/packages/termux-api/termux-clipboard-get b/packages/termux-api/termux-clipboard-get
index daaf6c426d29808e96803c22a4224de6d8317bec..3a39aace7715f73ce49be9a6b8a643a2e3965456 100755 (executable)
--- a/packages/termux-api/termux-clipboard-get
+++ b/packages/termux-api/termux-clipboard-get
@@ -1,3 +1,3 @@
-#!/system/bin/sh
+#!/bin/sh

 
 

-termux-api Clipboard
+@TERMUX_API@ Clipboard

diff --git a/packages/termux-api/termux-clipboard-set b/packages/termux-api/termux-clipboard-set
index 2ac3f4bd78c8b5487e7c5ecc576f84e802995430..076ea015581f1a5466d46bb8238bc71e56af0f2c 100755 (executable)
--- a/packages/termux-api/termux-clipboard-set
+++ b/packages/termux-api/termux-clipboard-set
@@ -1,4 +1,4 @@
-#!/system/bin/sh
+#!/bin/sh

 
 TEXT=`cat -`
 
 TEXT=`cat -`

-termux-api Clipboard --es text "$TEXT"
+@TERMUX_API@ Clipboard --es text "$TEXT"

diff --git a/packages/termux-api/termux-contact-list b/packages/termux-api/termux-contact-list
index 6773a0d811fdc992450f05384576b7c4f374ebb7..8f38e0345039dff155313a15ef99453b9c230882 100755 (executable)
--- a/packages/termux-api/termux-contact-list
+++ b/packages/termux-api/termux-contact-list
@@ -1,10 +1,10 @@
-#!/system/bin/sh
+#!/bin/sh

 set -e -u
 
 if [ "$#" != "0" ]; then
        echo "usage: termux-contact-list"
        echo "List all contacts."
 set -e -u
 
 if [ "$#" != "0" ]; then
        echo "usage: termux-contact-list"
        echo "List all contacts."

-       exit 1
+       exit

 fi
 
 fi
 

-termux-api ContactList
+@TERMUX_API@ ContactList

diff --git a/packages/termux-api/termux-dialog b/packages/termux-api/termux-dialog
index c5555ef8985e15ae1cf1c7f06a6b656479555a54..073c60e41ce6001f89b516c507d0a358d97076bd 100755 (executable)
--- a/packages/termux-api/termux-dialog
+++ b/packages/termux-api/termux-dialog
@@ -1,4 +1,4 @@
-#!/system/bin/sh
+#!/bin/sh

 
 set -e -u
 
 
 set -e -u
 


@@ -25,4 +25,4 @@ done
 # Too many arguments:
 if [ $# != 0 ]; then show_usage; exit 1; fi
 
 # Too many arguments:
 if [ $# != 0 ]; then show_usage; exit 1; fi
 

-eval termux-api Dialog $PARAMS
+eval @TERMUX_API@ Dialog $PARAMS

diff --git a/packages/termux-api/termux-download b/packages/termux-api/termux-download
index 1c7e469ba9a91285a46fc243b2488b1fd546ef4d..c7b8fea9839e1173ba63d433317e4c4a08ba1399 100755 (executable)
--- a/packages/termux-api/termux-download
+++ b/packages/termux-api/termux-download
@@ -1,4 +1,4 @@
-#!/system/bin/sh
+#!/bin/sh

 
 set -e -u
 
 
 set -e -u
 


@@ -27,4 +27,4 @@ done
 # Too many arguments:
 if [ $# != 1 ]; then show_usage; exit 1; fi
 
 # Too many arguments:
 if [ $# != 1 ]; then show_usage; exit 1; fi
 

-eval termux-api Download $PARAMS $1
+eval @TERMUX_API@ Download $PARAMS $1

diff --git a/packages/termux-api/termux-location b/packages/termux-api/termux-location
index 08d05aff281169ecd5fff54ccbf619ae1e292983..1c3e0fa0a6d7b25fb9b2a84543282fb601389e61 100755 (executable)
--- a/packages/termux-api/termux-location
+++ b/packages/termux-api/termux-location
@@ -1,4 +1,4 @@
-#!/system/bin/sh
+#!/bin/sh

 set -e -u
 
 PARAMS=""
 set -e -u
 
 PARAMS=""


@@ -25,4 +25,4 @@ done
 # Too many arguments:
 if [ $# != 0 ]; then show_usage; exit 1; fi
 
 # Too many arguments:
 if [ $# != 0 ]; then show_usage; exit 1; fi
 

-termux-api Location $PARAMS
+@TERMUX_API@ Location $PARAMS

diff --git a/packages/termux-api/termux-notification b/packages/termux-api/termux-notification
index 9c08440ca109fbe5e60f693f267b2b1fdccf13c9..d186d5f04bab7ed3637fb73d64e474899838f7eb 100755 (executable)
--- a/packages/termux-api/termux-notification
+++ b/packages/termux-api/termux-notification
@@ -1,4 +1,4 @@
-#!/system/bin/sh
+#!/bin/sh

 
 set -u
 
 
 set -u
 


@@ -35,4 +35,4 @@ if [ $CONTENT_OR_TITLE_SET = "no" ]; then
        exit 1;
 fi;
 
        exit 1;
 fi;
 

-termux-api Notification $PARAMS
+@TERMUX_API@ Notification $PARAMS

diff --git a/packages/termux-api/termux-share b/packages/termux-api/termux-share
index e0832725685e95b0075c9ea7df2d4ce29f3ff922..68044bdf7baf9af8e3955ece13d531f3edb4ef3d 100755 (executable)
--- a/packages/termux-api/termux-share
+++ b/packages/termux-api/termux-share
@@ -1,4 +1,4 @@
-#!/system/bin/sh
+#!/bin/sh

 
 show_usage () {
        echo "usage: termux-share [options] [file]"
 
 show_usage () {
        echo "usage: termux-share [options] [file]"


@@ -45,4 +45,4 @@ done
 if [ $# -gt 1 ]; then echo "Only one file can be shared"; exit 1; fi
 if [ $# != 0 ]; then PARAMS="$PARAMS --es file `realpath $1`"; fi
 
 if [ $# -gt 1 ]; then echo "Only one file can be shared"; exit 1; fi
 if [ $# != 0 ]; then PARAMS="$PARAMS --es file `realpath $1`"; fi
 

-termux-api Share $PARAMS
+@TERMUX_API@ Share $PARAMS

diff --git a/packages/termux-api/termux-sms-inbox b/packages/termux-api/termux-sms-inbox
index 8203e03977ef9d086ae477c639b88301a1b878bb..82b9f8bfd6a1df5d95f07d5a0f3df05d860c1744 100755 (executable)
--- a/packages/termux-api/termux-sms-inbox
+++ b/packages/termux-api/termux-sms-inbox
@@ -1,4 +1,4 @@
-#!/system/bin/sh
+#!/bin/sh

 set -u
 
 PARAM_LIMIT=10
 set -u
 
 PARAM_LIMIT=10


@@ -37,4 +37,4 @@ if [ $# != 0 ]; then show_usage; exit 1; fi
 
 PARAMS="$PARAMS --ei offset $PARAM_OFFSET --ei limit $PARAM_LIMIT"
 
 
 PARAMS="$PARAMS --ei offset $PARAM_OFFSET --ei limit $PARAM_LIMIT"
 

-termux-api SmsInbox $PARAMS
+@TERMUX_API@ SmsInbox $PARAMS

diff --git a/packages/termux-api/termux-sms-send b/packages/termux-api/termux-sms-send
index 7d35a01e73559eb6f3f6d2479872e8b1ebc8c28c..67b0f31030fbd5982cb9c7fdb77e6cd3b65373bd 100755 (executable)
--- a/packages/termux-api/termux-sms-send
+++ b/packages/termux-api/termux-sms-send
@@ -7,4 +7,4 @@ if [ $# != 1 -o $1 = "-h" ]; then
        exit 1
 fi
 
        exit 1
 fi
 

-termux-api SmsSend --es recipient $1
+@TERMUX_API@ SmsSend --es recipient $1

diff --git a/packages/termux-api/termux-toast b/packages/termux-api/termux-toast
index e54b04f1395ac1a66c45998fee6240feb26bfb25..247d09123b47af9d8b1068b08cf2758726f6b734 100755 (executable)
--- a/packages/termux-api/termux-toast
+++ b/packages/termux-api/termux-toast
@@ -1,4 +1,4 @@
-#!/system/bin/sh
+#!/bin/sh

 
 show_usage () {
        echo "usage: termux-toast [-s|--short]"
 
 show_usage () {
        echo "usage: termux-toast [-s|--short]"


@@ -21,4 +21,4 @@ done
 
 if [ $# != 0 ]; then show_usage; exit 1; fi
 
 
 if [ $# != 0 ]; then show_usage; exit 1; fi
 

-termux-api Toast $PARAMS
+@TERMUX_API@ Toast $PARAMS

diff --git a/packages/termux-api/termux-tts-engines b/packages/termux-api/termux-tts-engines
index fd4f021d7c1f968e6ad32acd03b18eaace705f40..18b55373d4d2ff328d6a633bb8cdd4f8a327648f 100755 (executable)
--- a/packages/termux-api/termux-tts-engines
+++ b/packages/termux-api/termux-tts-engines
@@ -1,3 +1,3 @@
-#!/system/bin/sh
+#!/bin/sh

 
 

-termux-api TextToSpeech --es engine LIST_AVAILABLE
+@TERMUX_API@ TextToSpeech --es engine LIST_AVAILABLE

diff --git a/packages/termux-api/termux-tts-speak b/packages/termux-api/termux-tts-speak
index ee0987118359daf963298341876d723d305e610f..9fe2b10efc6f2f51df03512ad7bdf8182138d2a2 100755 (executable)
--- a/packages/termux-api/termux-tts-speak
+++ b/packages/termux-api/termux-tts-speak
@@ -1,4 +1,4 @@
-#!/system/bin/sh
+#!/bin/sh

 
 set -u
 
 
 set -u
 


@@ -30,4 +30,4 @@ case "$1" in
 esac
 done
 
 esac
 done
 

-termux-api TextToSpeech $PARAMS
+@TERMUX_API@ TextToSpeech $PARAMS

diff --git a/packages/termux-api/termux-vibrate b/packages/termux-api/termux-vibrate
index 78187e028c54e667e67ce952ca1eafc5cb67729d..8146d2f3391143a45a8ae3484cbd04e037176dd5 100755 (executable)
--- a/packages/termux-api/termux-vibrate
+++ b/packages/termux-api/termux-vibrate
@@ -1,4 +1,4 @@
-#!/system/bin/sh
+#!/bin/sh

 
 set -e -u
 
 
 set -e -u
 


@@ -20,4 +20,4 @@ case "$1" in
 esac
 done
 
 esac
 done
 

-termux-api Vibrate $PARAM_DURATION
+@TERMUX_API@ Vibrate $PARAM_DURATION