diff options
| author | Markus Hauck <markus1189@gmail.com> | 2016-10-01 11:17:30 +0200 |
|---|---|---|
| committer | Markus Hauck <markus1189@gmail.com> | 2016-10-04 20:15:37 +0200 |
| commit | aafbd405776e50ee349035b950f512a57c9fd28f (patch) | |
| tree | 54de0f61ece224a12a2d1ded728d2f86e6257e2e /pkgs/servers/x11 | |
| parent | 58b6c8407111a8b6b886964387ad753fd4972ab3 (diff) | |
| download | nixlib-aafbd405776e50ee349035b950f512a57c9fd28f.tar nixlib-aafbd405776e50ee349035b950f512a57c9fd28f.tar.gz nixlib-aafbd405776e50ee349035b950f512a57c9fd28f.tar.bz2 nixlib-aafbd405776e50ee349035b950f512a57c9fd28f.tar.lz nixlib-aafbd405776e50ee349035b950f512a57c9fd28f.tar.xz nixlib-aafbd405776e50ee349035b950f512a57c9fd28f.tar.zst nixlib-aafbd405776e50ee349035b950f512a57c9fd28f.zip | |
Replace hard coded /bin/bash occurrences
Diffstat (limited to 'pkgs/servers/x11')
| -rwxr-xr-x | pkgs/servers/x11/xquartz/X11 | 2 | ||||
| -rwxr-xr-x | pkgs/servers/x11/xquartz/font_cache | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/x11/xquartz/X11 b/pkgs/servers/x11/xquartz/X11 index 39bcce2c10b6..e6bb87fab3fe 100755 --- a/pkgs/servers/x11/xquartz/X11 +++ b/pkgs/servers/x11/xquartz/X11 @@ -1,4 +1,4 @@ -#!/bin/bash +#!@shell@ set "$(dirname "$0")"/X11.bin "${@}" diff --git a/pkgs/servers/x11/xquartz/font_cache b/pkgs/servers/x11/xquartz/font_cache index 12858af8bc60..b1191980d77f 100755 --- a/pkgs/servers/x11/xquartz/font_cache +++ b/pkgs/servers/x11/xquartz/font_cache @@ -1,4 +1,4 @@ -#!/bin/bash +#!@shell@ export PATH=@PATH@:$PATH @@ -83,7 +83,7 @@ get_fontdirs() { if [[ $osxfonts == 1 ]] ; then find {/System/,/}Library/Fonts -type d fi - else + else if [[ $osxfonts == 1 && -d "${HOME}/Library/Fonts" ]] ; then find "${HOME}/Library/Fonts" -type d fi |