diff options
| author | Jörg Thalheim <joerg@higgsboson.tk> | 2016-10-05 17:16:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-05 17:16:00 +0200 |
| commit | 1bd8d7710ea35d3d65245d9c316c86ca0f428ece (patch) | |
| tree | 8dda47534844aa68663268c5f0c4759c724a441f /pkgs/servers | |
| parent | b0d77698bfb18d435a99ff2ffe4ca807cb0f9002 (diff) | |
| parent | aafbd405776e50ee349035b950f512a57c9fd28f (diff) | |
| download | nixpkgs-1bd8d7710ea35d3d65245d9c316c86ca0f428ece.tar nixpkgs-1bd8d7710ea35d3d65245d9c316c86ca0f428ece.tar.gz nixpkgs-1bd8d7710ea35d3d65245d9c316c86ca0f428ece.tar.bz2 nixpkgs-1bd8d7710ea35d3d65245d9c316c86ca0f428ece.tar.lz nixpkgs-1bd8d7710ea35d3d65245d9c316c86ca0f428ece.tar.xz nixpkgs-1bd8d7710ea35d3d65245d9c316c86ca0f428ece.tar.zst nixpkgs-1bd8d7710ea35d3d65245d9c316c86ca0f428ece.zip | |
Merge pull request #19125 from markus1189/bin-bash-cleanup
Bin bash cleanup
Diffstat (limited to 'pkgs/servers')
| -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 39bcce2c10b..e6bb87fab3f 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 12858af8bc6..b1191980d77 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 |