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

fish: Fix runtime tmp path

Browse Source
This commit is contained in:
Fredrik Fornwall 2016-03-12 15:53:13 -05:00
parent ba991d9ad2
commit 1f6040f4e7
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/fish/env_universal_common.cpp.patch
View File

@ -1,7 +1,16 @@
diff -u -r ../fish-2.2.0/env_universal_common.cpp ./env_universal_common.cpp diff -u -r ../fish-shell-master/src/env_universal_common.cpp ./src/env_universal_common.cpp
--- ../fish-2.2.0/env_universal_common.cpp 2015-07-03 15:46:59.000000000 -0400 --- ../fish-shell-master/src/env_universal_common.cpp 2016-03-09 07:07:04.000000000 -0500
+++ ./src/env_universal_common.cpp 2015-07-13 02:16:14.591286575 -0400 +++ ./src/env_universal_common.cpp 2016-03-12 15:47:14.502255105 -0500
@@ -1089,6 +1089,7 @@ @@ -166,7 +166,7 @@
}
// /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)
{
@@ -1142,6 +1142,7 @@
return result; return result;
} }
@ -9,7 +18,7 @@ diff -u -r ../fish-2.2.0/env_universal_common.cpp ./env_universal_common.cpp
class universal_notifier_shmem_poller_t : public universal_notifier_t class universal_notifier_shmem_poller_t : public universal_notifier_t
{ {
/* This is what our shared memory looks like. Everything here is stored in network byte order (big-endian) */ /* This is what our shared memory looks like. Everything here is stored in network byte order (big-endian) */
@@ -1251,6 +1252,7 @@ @@ -1304,6 +1305,7 @@
} }
} }
}; };
@ -17,7 +26,7 @@ diff -u -r ../fish-2.2.0/env_universal_common.cpp ./env_universal_common.cpp
/* A notifyd-based notifier. Very straightforward. */ /* A notifyd-based notifier. Very straightforward. */
class universal_notifier_notifyd_t : public universal_notifier_t class universal_notifier_notifyd_t : public universal_notifier_t
@@ -1572,7 +1574,9 @@ @@ -1625,7 +1627,9 @@
} options[] = } options[] =
{ {
{"default", universal_notifier_t::strategy_default}, {"default", universal_notifier_t::strategy_default},
@ -27,7 +36,7 @@ diff -u -r ../fish-2.2.0/env_universal_common.cpp ./env_universal_common.cpp
{"pipe", universal_notifier_t::strategy_named_pipe}, {"pipe", universal_notifier_t::strategy_named_pipe},
{"notifyd", universal_notifier_t::strategy_notifyd} {"notifyd", universal_notifier_t::strategy_notifyd}
}; };
@@ -1632,8 +1636,10 @@ @@ -1687,8 +1691,10 @@
} }
switch (strat) switch (strat)
{ {