sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fish: Update from 3.0.0 to 3.0.1

Browse Source
This commit is contained in:
Fredrik Fornwall 2019-02-13 23:35:18 +01:00
parent f2dcc0299f
commit 906413fae0
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/fish/build.sh
View File

@ -1,8 +1,8 @@
TERMUX_PKG_HOMEPAGE=https://fishshell.com/
TERMUX_PKG_DESCRIPTION="Shell geared towards interactive use"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_VERSION=3.0.0
TERMUX_PKG_SHA256=ea9dd3614bb0346829ce7319437c6a93e3e1dfde3b7f6a469b543b0d2c68f2cf
TERMUX_PKG_VERSION=3.0.1
TERMUX_PKG_SHA256=21677a5755ee1738bad2cf8179c104068f8bb81b969660d5a2af4ba6eceba5e4
TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/releases/download/$TERMUX_PKG_VERSION/fish-${TERMUX_PKG_VERSION}.tar.gz
# fish calls 'tput' from ncurses-utils, at least when cancelling (Ctrl+C) a command line.
# man is needed since fish calls apropos during command completion.

18
packages/fish/src-env.cpp.patch
View File

@ -1,12 +1,12 @@
diff -u -r ../fish-3.0.0/src/env.cpp ./src/env.cpp
--- ../fish-3.0.0/src/env.cpp 2018-12-28 13:01:03.000000000 +0000
+++ ./src/env.cpp 2018-12-28 23:00:54.389770761 +0000
@@ -1656,7 +1656,7 @@
// See https://github.com/fish-shell/fish-shell/issues/5180
const char *uname = getpwuid(geteuid())->pw_name;
diff -u -r ../fish-3.0.1/src/env.cpp ./src/env.cpp
--- ../fish-3.0.1/src/env.cpp 2019-02-11 12:13:15.000000000 +0000
+++ ./src/env.cpp 2019-02-13 22:19:56.975817836 +0000
@@ -1663,7 +1663,7 @@
auto pwuid = getpwuid(geteuid());
const char *uname = pwuid ? pwuid->pw_name : NULL;
// /tmp/fish.user
- std::string tmpdir = "/tmp/fish.";
+ std::string tmpdir = "@TERMUX_PREFIX@/tmp/fish.";
tmpdir.append(uname);
if (check_runtime_path(tmpdir.c_str()) != 0) {
if (uname) {
tmpdir.append(uname);
}