make it possible to easily change prefix in binary & scripts

termux · Oct 30, 2020 · e3c3811 · e3c3811
1 parent 1519179
commit e3c3811
Show file tree

Hide file tree

Showing 46 changed files with 99 additions and 96 deletions.
diff --git a/Makefile b/Makefile
@@ -1,12 +1,15 @@
-CFLAGS += -std=c11 -Wall -Wextra -pedantic -Werror
 PREFIX ?= /data/data/com.termux/files/usr
+CFLAGS += -std=c11 -Wall -Wextra -pedantic -Werror -DPREFIX=\"$(PREFIX)\"
 
 termux-api: termux-api.c
 
 install: termux-api
 	mkdir -p $(PREFIX)/bin/ $(PREFIX)/libexec/
 	install termux-api $(PREFIX)/libexec/
 	install termux-callback $(PREFIX)/libexec/
-	install scripts/* $(PREFIX)/bin/
+	for i in scripts/*; do \
+	  sed -e "s|@TERMUX_PREFIX@|$(PREFIX)|g" $i $(PREFIX)/bin/$i; \
+	  chmod 700 $(PREFIX)/bin/$i; \
+	done
 
 .PHONY: install
diff --git a/scripts/termux-audio-info b/scripts/termux-audio-info
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
 SCRIPTNAME=termux-audio-info
@@ -19,4 +19,4 @@ shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 
-/data/data/com.termux/files/usr/libexec/termux-api AudioInfo
+@TERMUX_PREFIX@/libexec/termux-api AudioInfo
diff --git a/scripts/termux-battery-status b/scripts/termux-battery-status
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
 SCRIPTNAME=termux-battery-status
@@ -19,4 +19,4 @@ shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 
-/data/data/com.termux/files/usr/libexec/termux-api BatteryStatus
+@TERMUX_PREFIX@/libexec/termux-api BatteryStatus
diff --git a/scripts/termux-brightness b/scripts/termux-brightness
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/bash
+#!@TERMUX_PREFIX@/bin/bash
 set -e -u
 
 SCRIPTNAME=termux-brightness
@@ -23,4 +23,4 @@ else
 ARGS="--ei brightness $1 --ez auto false"
 fi
 
-/data/data/com.termux/files/usr/libexec/termux-api Brightness $ARGS
+@TERMUX_PREFIX@/libexec/termux-api Brightness $ARGS
diff --git a/scripts/termux-call-log b/scripts/termux-call-log
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/bash
+#!@TERMUX_PREFIX@/bin/bash
 set -u
 
 PARAM_LIMIT=10
@@ -29,4 +29,4 @@ shift $((OPTIND-1))
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 
 PARAMS="$PARAMS --ei offset $PARAM_OFFSET --ei limit $PARAM_LIMIT"
-/data/data/com.termux/files/usr/libexec/termux-api CallLog $PARAMS
+@TERMUX_PREFIX@/libexec/termux-api CallLog $PARAMS
diff --git a/scripts/termux-camera-info b/scripts/termux-camera-info
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
 SCRIPTNAME=termux-camera-info
@@ -19,4 +19,4 @@ shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 
-/data/data/com.termux/files/usr/libexec/termux-api CameraInfo
+@TERMUX_PREFIX@/libexec/termux-api CameraInfo
diff --git a/scripts/termux-camera-photo b/scripts/termux-camera-photo
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
 SCRIPTNAME=termux-camera-photo
@@ -27,4 +27,4 @@ if [ $# != 1 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 touch "$1"
 PARAMS="$PARAMS --es file `realpath $1`"
 
-/data/data/com.termux/files/usr/libexec/termux-api CameraPhoto $PARAMS
+@TERMUX_PREFIX@/libexec/termux-api CameraPhoto $PARAMS
diff --git a/scripts/termux-clipboard-get b/scripts/termux-clipboard-get
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
 SCRIPTNAME=termux-clipboard-get
@@ -19,4 +19,4 @@ shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 
-/data/data/com.termux/files/usr/libexec/termux-api Clipboard
+@TERMUX_PREFIX@/libexec/termux-api Clipboard
diff --git a/scripts/termux-clipboard-set b/scripts/termux-clipboard-set
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
 SCRIPTNAME=termux-clipboard-set
@@ -17,7 +17,7 @@ do
 done
 shift $((OPTIND-1))
 
-CMD="/data/data/com.termux/files/usr/libexec/termux-api Clipboard -e api_version 2 --ez set true"
+CMD="@TERMUX_PREFIX@/libexec/termux-api Clipboard -e api_version 2 --ez set true"
 if [ $# = 0 ]; then
 	$CMD
 else

diff --git a/scripts/termux-contact-list b/scripts/termux-contact-list
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
 SCRIPTNAME=termux-contact-list
@@ -19,4 +19,4 @@ shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 
-/data/data/com.termux/files/usr/libexec/termux-api ContactList
+@TERMUX_PREFIX@/libexec/termux-api ContactList
diff --git a/scripts/termux-dialog b/scripts/termux-dialog
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/bash
+#!@TERMUX_PREFIX@/bin/bash
 set -e -u
 
 DEFAULT_WIDGET="text"
@@ -277,4 +277,4 @@ if [ -n "$ARG_P" ]; then set -- "$@" $ARG_P "$OPT_P"; fi
 if [ -n "$ARG_N" ]; then set -- "$@" $ARG_N "$OPT_N"; fi
 if [ -n "$ARG_D" ]; then set -- "$@" $ARG_D "$OPT_D"; fi
 
-/data/data/com.termux/files/usr/libexec/termux-api Dialog "$@"
+@TERMUX_PREFIX@/libexec/termux-api Dialog "$@"
diff --git a/scripts/termux-download b/scripts/termux-download
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
 SCRIPTNAME=termux-download
@@ -41,4 +41,4 @@ if [ -n "$ARG_T" ]; then set -- "$@" $ARG_T "$OPT_T"; fi
 if [ -n "$ARG_P" ]; then set -- "$@" $ARG_P "$OPT_P"; fi
 set -- "$@" "$URL_TO_DOWNLOAD"
 
-/data/data/com.termux/files/usr/libexec/termux-api Download "$@"
+@TERMUX_PREFIX@/libexec/termux-api Download "$@"
diff --git a/scripts/termux-fingerprint b/scripts/termux-fingerprint
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
 SCRIPTNAME=termux-fingerprint
@@ -36,4 +36,4 @@ if [ -n "$ARG_D" ]; then set -- "$@" $ARG_D "$OPT_D"; fi
 if [ -n "$ARG_S" ]; then set -- "$@" $ARG_S "$OPT_S"; fi
 if [ -n "$ARG_C" ]; then set -- "$@" $ARG_C "$OPT_C"; fi
 
-/data/data/com.termux/files/usr/libexec/termux-api Fingerprint "$@"
+@TERMUX_PREFIX@/libexec/termux-api Fingerprint "$@"
diff --git a/scripts/termux-infrared-frequencies b/scripts/termux-infrared-frequencies
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
 SCRIPTNAME=termux-infrared-frequencies
@@ -19,4 +19,4 @@ shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 
-/data/data/com.termux/files/usr/libexec/termux-api InfraredFrequencies
+@TERMUX_PREFIX@/libexec/termux-api InfraredFrequencies
diff --git a/scripts/termux-infrared-transmit b/scripts/termux-infrared-transmit
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
 SCRIPTNAME=termux-infrared-transmit
@@ -25,4 +25,4 @@ if [ -z "$FREQUENCY" ]; then echo "$SCRIPTNAME: No frequency specified"; exit 1;
 if [ $# -lt 1 ]; then echo "$SCRIPTNAME: too few arguments"; exit 1; fi
 if [ $# -gt 1 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 
-/data/data/com.termux/files/usr/libexec/termux-api InfraredTransmit $FREQUENCY --eia pattern $1
+@TERMUX_PREFIX@/libexec/termux-api InfraredTransmit $FREQUENCY --eia pattern $1
diff --git a/scripts/termux-job-scheduler b/scripts/termux-job-scheduler
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/bash
+#!@TERMUX_PREFIX@/bin/bash
 set -e -u -f
 
 SCRIPTNAME=termux-job-scheduler
@@ -90,4 +90,4 @@ if [ -n "$OPT_PERSISTED" ]; then set -- "$@" --ez persisted "$OPT_PERSISTED"; fi
 if [ -n "$OPT_TRIGGER_CONTENT_URI" ]; then set -- "$@" --es trigger_content_uri "$OPT_TRIGGER_CONTENT_URI"; fi
 if [ -n "$OPT_TRIGGER_CONTENT_FLAG" ]; then set -- "$@" --ez trigger_content_flag "$OPT_TRIGGER_CONTENT_FLAG"; fi
 
-/data/data/com.termux/files/usr/libexec/termux-api JobScheduler "$@"
+@TERMUX_PREFIX@/libexec/termux-api JobScheduler "$@"
diff --git a/scripts/termux-keystore b/scripts/termux-keystore
@@ -1,7 +1,7 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
-readonly CMD_BASE="/data/data/com.termux/files/usr/libexec/termux-api Keystore"
+readonly CMD_BASE="@TERMUX_PREFIX@/libexec/termux-api Keystore"
 
 SCRIPTNAME=termux-keystore
 show_usage () {

diff --git a/scripts/termux-location b/scripts/termux-location
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
 SCRIPTNAME=termux-location
@@ -45,4 +45,4 @@ shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 
-/data/data/com.termux/files/usr/libexec/termux-api Location $PARAMS
+@TERMUX_PREFIX@/libexec/termux-api Location $PARAMS
diff --git a/scripts/termux-media-player b/scripts/termux-media-player
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/bash
+#!@TERMUX_PREFIX@/bin/bash
 set -e
 
 SCRIPTNAME=termux-media-player
@@ -15,7 +15,7 @@ show_usage () {
 }
 
 main() {
-    /data/data/com.termux/files/usr/libexec/termux-api MediaPlayer "$@"
+    @TERMUX_PREFIX@/libexec/termux-api MediaPlayer "$@"
 }
 
 case "$1" in

diff --git a/scripts/termux-media-scan b/scripts/termux-media-scan
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/bash
+#!@TERMUX_PREFIX@/bin/bash
 set -e -u
 
 SCRIPTNAME=termux-media-scan
@@ -39,4 +39,4 @@ shift $((OPTIND-1))
 if [ $# = 0 ]; then echo "$SCRIPTNAME: missing file argument"; exit 1; fi
 
 PATHS=`get_paths "$@" | sed ':a;N;$!ba;s/,/\\\\,/g;s/\n/,/g'`
-/data/data/com.termux/files/usr/libexec/termux-api MediaScanner $PARAMS "$PATHS"
+@TERMUX_PREFIX@/libexec/termux-api MediaScanner $PARAMS "$PATHS"
diff --git a/scripts/termux-microphone-record b/scripts/termux-microphone-record
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/bash
+#!@TERMUX_PREFIX@/bin/bash
 set -e
 
 SCRIPTNAME=termux-microphone-record
@@ -39,7 +39,7 @@ add_params() {
 }
 
 call_api () {
-    /data/data/com.termux/files/usr/libexec/termux-api MicRecorder "$@"
+    @TERMUX_PREFIX@/libexec/termux-api MicRecorder "$@"
 }
 
 while getopts h,f:,l:,e:,b:,r:,c:,d,i,q option

diff --git a/scripts/termux-notification b/scripts/termux-notification
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/bash
+#!@TERMUX_PREFIX@/bin/bash
 set -e -u -f
 
 SCRIPTNAME=termux-notification
@@ -190,7 +190,7 @@ if [ -n "$OPT_VIBRATE" ]; then set -- "$@" --ela vibrate "$OPT_VIBRATE"; fi
 if [ -n "$OPT_CONTENT"  ] || [ -t 0 ]; then
 	# we either have some content, so it takes precedence over STDIN
 	# or have no STDIN, so we must use content even if empty
-	echo "$OPT_CONTENT" | /data/data/com.termux/files/usr/libexec/termux-api Notification "$@"
+	echo "$OPT_CONTENT" | @TERMUX_PREFIX@/libexec/termux-api Notification "$@"
 else # use STDIN
-	/data/data/com.termux/files/usr/libexec/termux-api Notification "$@"
+	@TERMUX_PREFIX@/libexec/termux-api Notification "$@"
 fi
diff --git a/scripts/termux-notification-list b/scripts/termux-notification-list
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
 SCRIPTNAME=termux-notification-list
@@ -19,4 +19,4 @@ shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 
-/data/data/com.termux/files/usr/libexec/termux-api NotificationList
+@TERMUX_PREFIX@/libexec/termux-api NotificationList
diff --git a/scripts/termux-notification-remove b/scripts/termux-notification-remove
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
 SCRIPTNAME=termux-notification-remove
@@ -19,4 +19,4 @@ shift $((OPTIND-1))
 
 if [ $# != 1 ]; then echo "$SCRIPTNAME: no notification id specified"; exit 1; fi
 
-/data/data/com.termux/files/usr/libexec/termux-api NotificationRemove --es id "$1"
+@TERMUX_PREFIX@/libexec/termux-api NotificationRemove --es id "$1"
diff --git a/scripts/termux-sensor b/scripts/termux-sensor
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/bash
+#!@TERMUX_PREFIX@/bin/bash
 set -e -u
 
 SCRIPTNAME=termux-sensor
@@ -69,7 +69,7 @@ get_limit () {
 }
 
 call_api () {
-	/data/data/com.termux/files/usr/libexec/termux-api Sensor "$@"
+	@TERMUX_PREFIX@/libexec/termux-api Sensor "$@"
 }
 
 set_flag () {

diff --git a/scripts/termux-share b/scripts/termux-share
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
 SCRIPTNAME=termux-share
@@ -48,7 +48,7 @@ if [ $# != 0 ]; then
     fi
 
     # Note that the file path can contain whitespace.
-    /data/data/com.termux/files/usr/libexec/termux-api Share $PARAMS --es file "$(realpath "$1")"
+    @TERMUX_PREFIX@/libexec/termux-api Share $PARAMS --es file "$(realpath "$1")"
 else
-    /data/data/com.termux/files/usr/libexec/termux-api Share $PARAMS
+    @TERMUX_PREFIX@/libexec/termux-api Share $PARAMS
 fi
diff --git a/scripts/termux-sms-inbox b/scripts/termux-sms-inbox
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 
 echo "termux-sms-inbox: This script has been replaced by termux-sms-list."
 exit 1
diff --git a/scripts/termux-sms-list b/scripts/termux-sms-list
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -u
 
 PARAM_LIMIT=10
@@ -47,4 +47,4 @@ case "$PARAM_TYPE" in
 esac
 
 PARAMS="$PARAMS --ei offset $PARAM_OFFSET --ei limit $PARAM_LIMIT --ei type $PARAM_TYPE"
-/data/data/com.termux/files/usr/libexec/termux-api SmsInbox $PARAMS
+@TERMUX_PREFIX@/libexec/termux-api SmsInbox $PARAMS
diff --git a/scripts/termux-sms-send b/scripts/termux-sms-send
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
 SCRIPTNAME=termux-sms-send
@@ -24,7 +24,7 @@ if [ -z "$RECIPIENTS" ]; then
     echo "$SCRIPTNAME: no recipient number given"; exit 1;
 fi
 
-CMD="/data/data/com.termux/files/usr/libexec/termux-api SmsSend $RECIPIENTS"
+CMD="@TERMUX_PREFIX@/libexec/termux-api SmsSend $RECIPIENTS"
 if [ $# = 0 ]; then
     $CMD
 else

diff --git a/scripts/termux-speech-to-text b/scripts/termux-speech-to-text
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
 SCRIPTNAME=termux-speech-to-text
@@ -21,7 +21,7 @@ shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 
-CMD=/data/data/com.termux/files/usr/libexec/termux-api
+CMD=@TERMUX_PREFIX@/libexec/termux-api
 if [ $show_progress = true ]; then
   $CMD SpeechToText
 else

diff --git a/scripts/termux-storage-get b/scripts/termux-storage-get
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!@TERMUX_PREFIX@/bin/sh
 set -e -u
 
 SCRIPTNAME=termux-storage-get
@@ -21,4 +21,4 @@ shift $((OPTIND-1))
 if [ $# -gt 1 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 if [ $# -lt 1 ]; then echo "$SCRIPTNAME: no output file specified"; exit 1; fi
 
-/data/data/com.termux/files/usr/libexec/termux-api StorageGet --es file "$(realpath "$1")"
+@TERMUX_PREFIX@/libexec/termux-api StorageGet --es file "$(realpath "$1")"