tyler.durden
/
powerline
mirror of https://github.com/powerline/powerline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1387 from mdeaudelin/develop 

Fix dash bindings on OS X
This commit is contained in:
Nikolai Aleksandrovich Pavlov 2015-05-30 17:45:34 +03:00
parent b7bd94d55d c93829385b
commit b789437ce1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
powerline/bindings/shell/powerline.sh
View File

@ -66,7 +66,7 @@ _powerline_set_append_trap() {
_powerline_create_temp() { _powerline_create_temp() {
if test -z "$_POWERLINE_TEMP" || ! test -e "$_POWERLINE_TEMP" ; then if test -z "$_POWERLINE_TEMP" || ! test -e "$_POWERLINE_TEMP" ; then
_POWERLINE_TEMP="$(mktemp)" _POWERLINE_TEMP="$(mktemp "${TMPDIR:-/tmp}/powerline.XXXXXXXX")"
_powerline_append_trap 'rm $_POWERLINE_TEMP' EXIT _powerline_append_trap 'rm $_POWERLINE_TEMP' EXIT
fi fi
} }
@ -74,7 +74,7 @@ _powerline_create_temp() {
_powerline_set_set_jobs() { _powerline_set_set_jobs() {
if _powerline_has_jobs_in_subshell "$@" ; then if _powerline_has_jobs_in_subshell "$@" ; then
_powerline_set_jobs() { _powerline_set_jobs() {
_POWERLINE_JOBS="$(jobs -p|wc -l)" _POWERLINE_JOBS="$(jobs -p|wc -l|tr -d ' ')"
} }
else else
_powerline_set_append_trap "$@" _powerline_set_append_trap "$@"
@ -90,7 +90,7 @@ _powerline_set_set_jobs() {
kill -USR1 $_POWERLINE_PID kill -USR1 $_POWERLINE_PID
# Note: most likely this will read data from the previous run. Tests # Note: most likely this will read data from the previous run. Tests
# show that it is OK for some reasons. # show that it is OK for some reasons.
_POWERLINE_JOBS="$(wc -l < $_POWERLINE_TEMP)" _POWERLINE_JOBS="$(wc -l < $_POWERLINE_TEMP | tr -d ' ')"
} }
fi fi
_powerline_set_set_jobs() { _powerline_set_set_jobs() {

1
tests/test_shells/test.sh
View File

@ -188,6 +188,7 @@ ln -s "$(which mktemp)" tests/shell/path
ln -s "$(which grep)" tests/shell/path ln -s "$(which grep)" tests/shell/path
ln -s "$(which sed)" tests/shell/path ln -s "$(which sed)" tests/shell/path
ln -s "$(which rm)" tests/shell/path ln -s "$(which rm)" tests/shell/path
ln -s "$(which tr)" tests/shell/path
ln -s "$(which uname)" tests/shell/path ln -s "$(which uname)" tests/shell/path
ln -s "$(which test)" tests/shell/path ln -s "$(which test)" tests/shell/path
ln -s "$(which pwd)" tests/shell/path ln -s "$(which pwd)" tests/shell/path