diff --git a/packages/entr/build.sh b/packages/entr/build.sh index 079435f60..5eb439e34 100644 --- a/packages/entr/build.sh +++ b/packages/entr/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://eradman.com/entrproject/ TERMUX_PKG_DESCRIPTION="Event Notify Test Runner - run arbitrary commands when files change" TERMUX_PKG_LICENSE="ISC" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=4.7 -TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/e/entr/entr_$TERMUX_PKG_VERSION.orig.tar.gz -TERMUX_PKG_SHA256=b6c1ab7644d83bb2a269dc74160867a3be0f5df116c7eb453c25053173534429 +TERMUX_PKG_VERSION=5.0 +TERMUX_PKG_SRCURL=http://eradman.com/entrproject/code/entr-$TERMUX_PKG_VERSION.tar.gz +TERMUX_PKG_SHA256=2a87bb7d9e5e89b6f614495937b557dbb8144ea53d0c1fa1812388982cd41ebb TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure() { diff --git a/packages/entr/entr.c.patch b/packages/entr/entr.c.patch new file mode 100644 index 000000000..e304feb31 --- /dev/null +++ b/packages/entr/entr.c.patch @@ -0,0 +1,15 @@ +--- ./entr.c 2021-07-02 20:20:26.000000000 +0530 ++++ ./entr.c.mod 2021-07-26 20:02:28.474638318 +0530 +@@ -183,10 +183,10 @@ + fprintf(stderr, "open_max: %d\n", open_max); + + /* prevent interactive utilities from paging output */ +- setenv("PAGER", "/bin/cat", 0); ++ setenv("PAGER", "@TERMUX_PREFIX@/bin/cat", 0); + + /* ensure a shell is available to use */ +- setenv("SHELL", "/bin/sh", 0); ++ setenv("SHELL", "@TERMUX_PREFIX@/bin/sh", 0); + + /* sequential scan may depend on a 0 at the end */ + files = calloc(open_max+1, sizeof(WatchFile *)); diff --git a/packages/entr/path.patch b/packages/entr/path.patch deleted file mode 100644 index ab7d5266a..000000000 --- a/packages/entr/path.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/entr.c b/entr.c -index 3316f47..10c590a 100644 ---- a/entr.c -+++ b/entr.c -@@ -165,10 +165,10 @@ main(int argc, char *argv[]) { - #endif - - /* prevent interactive utilities from paging output */ -- setenv("PAGER", "/bin/cat", 0); -+ setenv("PAGER", "@TERMUX_PREFIX@/bin/cat", 0); - - /* ensure a shell is available to use */ -- setenv("SHELL", "/bin/sh", 0); -+ setenv("SHELL", "@TERMUX_PREFIX@/bin/sh", 0); - - /* sequential scan may depend on a 0 at the end */ - files = calloc(rl.rlim_cur+1, sizeof(WatchFile *)); -@@ -446,7 +446,7 @@ run_utility(char *argv[]) { - - if (pid == 0) { - if (clear_opt == 1) -- system("/usr/bin/clear"); -+ system("@TERMUX_PREFIX@/bin/clear"); - /* Set process group so subprocess can be signaled */ - if (restart_opt == 1) { - setpgid(0, getpid());