Avoid hard-coded paths in some more places

The plan is to allow other apps to build packages by changing the
prefix.

diff --git a/packages/apt/build.sh b/packages/apt/build.sh
index 6a399084af8d526d2f1273d08eef2fb57bcb107c..b74d4485fdae7aa422cfef8dd47b9afa0b1eb4ed 100644 (file)
--- a/packages/apt/build.sh
+++ b/packages/apt/build.sh
@@ -35,6 +35,6 @@ lib/libapt-inst.so
 
 termux_step_post_make_install() {
        printf "# The main termux repository:\ndeb [arch=all,${TERMUX_ARCH}] https://termux.net stable main\n" > $TERMUX_PREFIX/etc/apt/sources.list
-        cp $TERMUX_PKG_BUILDER_DIR/trusted.gpg $TERMUX_PREFIX/etc/apt/
-       rm /data/data/com.termux/files/usr/include/apt-pkg -r
+       cp $TERMUX_PKG_BUILDER_DIR/trusted.gpg $TERMUX_PREFIX/etc/apt/
+       rm $TERMUX_PREFIX/include/apt-pkg -r
 }

diff --git a/packages/cowsay/install.sh.patch b/packages/cowsay/install.sh.patch
index 5adee6cd2882b9448ebee5180bd2fae4bf9b2bb4..40de879e62a79e1f1f07c9effa6d4f32c78f0218 100644 (file)
--- a/packages/cowsay/install.sh.patch
+++ b/packages/cowsay/install.sh.patch
@@ -55,8 +55,8 @@ diff -u -r ../cowsay-3.03+dfsg1/install.sh ./install.sh
 -fi
 -
 -PREFIX=${prefix:-/usr/local}
-+usethisperl=/data/data/com.termux/files/usr/bin/perl
-+PREFIX=/data/data/com.termux/files/usr
++usethisperl=@TERMUX_PREFIX@/bin/perl
++PREFIX=@TERMUX_PREFIX@
  
  echo Okay, time to install this puppy.
  

diff --git a/packages/mpd/mpdconf.example.patch b/packages/mpd/mpdconf.example.patch
index 96e2eccb9cf902129f68a1452886158971148580..343a408d4ececb301903ad026ee582f1195a34d5 100644 (file)
--- a/packages/mpd/mpdconf.example.patch
+++ b/packages/mpd/mpdconf.example.patch
@@ -1,4 +1,4 @@
---- /data/data/com.termux/files/home/MPD-0.20.8.old/doc/mpdconf.example        2017-07-18 12:54:14.570036043 +0200
+--- ./doc/mpdconf.example      2017-07-18 12:54:14.570036043 +0200
 +++ ./doc/mpdconf.example      2017-07-18 12:56:34.270035990 +0200
 @@ -10,14 +10,14 @@
  # be disabled and audio files will only be accepted over ipc socket (using
@@ -31,7 +31,7 @@
  # setting defaults to logging to syslog, otherwise logging is disabled.
  #
 -#log_file                     "~/.mpd/log"
-+#log_file                     "/data/data/com.termux/files/home/.mpd/log"
++#log_file                     "@TERMUX_HOME@/.mpd/log"
  #
  # This setting sets the location of the file which stores the process ID
  # for use of mpd --kill and some init scripts. This setting is disabled by
@@ -68,7 +68,7 @@
  #
  # And for Unix Socket
 -#bind_to_address              "~/.mpd/socket"
-+bind_to_address               "/data/data/com.termux/files/usr/tmp/mpd.socket"
++bind_to_address               "@TERMUX_PREFIX@/tmp/mpd.socket"
  #
  # This setting is the TCP port that is desired for the daemon to get assigned
 -# to.

diff --git a/packages/multitail/Makefile.patch b/packages/multitail/Makefile.patch
index 75e03a98e530d2389754591bee8abc67f2999d8e..b409ed4a3ade57c9fffba6b0b27e9ea6300e8cdd 100644 (file)
--- a/packages/multitail/Makefile.patch
+++ b/packages/multitail/Makefile.patch
@@ -7,7 +7,7 @@ diff -u -r ../multitail-6.4.1/Makefile ./Makefile
  UTF8_SUPPORT=yes
 -DESTDIR=
 -PREFIX=/usr
-+DESTDIR=/data/data/com.termux/files/usr
++DESTDIR=@TERMUX_PREFIX@
 +PREFIX=
  CONFIG_FILE=$(DESTDIR)/etc/multitail.conf
  

diff --git a/packages/openssh/source-ssh-agent.sh b/packages/openssh/source-ssh-agent.sh
index 63bf57c0a0d4df541210af1bdef8cc7516205ecb..3051c869f5569d9dfec52bfe73fa44bf96d1ba9f 100755 (executable)
--- a/packages/openssh/source-ssh-agent.sh
+++ b/packages/openssh/source-ssh-agent.sh
@@ -1,4 +1,4 @@
-#!/data/data/com.termux/files/usr/bin/sh
+#!/bin/sh
 # source-ssh-agent: Script to source for ssh-agent to work.
 
 # Check if accidentaly executed instead of sourced: