diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2015-11-11 15:21:42 -0500 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2015-11-11 15:21:42 -0500 |
commit | 579cd7541b0ed9bf9df3e9e87df7a5af4d490baa (patch) | |
tree | 84d9af729e5248e1faa30777f5613df3e644d9f6 | |
parent | ce3ea550e02da88cb3236309655ef890f32a0ed8 (diff) | |
parent | 62017cc5a39a0298a3227ebb6182fd83f28b5e22 (diff) | |
download | luarocks-579cd7541b0ed9bf9df3e9e87df7a5af4d490baa.tar.gz luarocks-579cd7541b0ed9bf9df3e9e87df7a5af4d490baa.tar.bz2 luarocks-579cd7541b0ed9bf9df3e9e87df7a5af4d490baa.zip |
Merge pull request #448 from zoresvit/patch-1
Fix `find_program` function to be less fragile
-rwxr-xr-x | configure | 21 |
1 files changed, 1 insertions, 20 deletions
@@ -71,26 +71,7 @@ EOF | |||
71 | # Helper functions | 71 | # Helper functions |
72 | 72 | ||
73 | find_program() { | 73 | find_program() { |
74 | path="$PATH" | 74 | command -v "$1" 2>/dev/null |
75 | item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`" | ||
76 | path="`echo "$path" | sed -n 's/[^:]*::*\(.*\)/\1/p'`" | ||
77 | found="no" | ||
78 | while [ -n "$item" ] | ||
79 | do | ||
80 | if [ -f "$item/$1" ] | ||
81 | then | ||
82 | found="yes" | ||
83 | break | ||
84 | fi | ||
85 | item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`" | ||
86 | path="`echo "$path" | sed -n 's/[^:]*::*\(.*\)/\1/p'`" | ||
87 | done | ||
88 | if [ "$found" = "yes" ] | ||
89 | then | ||
90 | echo "$item" | ||
91 | else | ||
92 | echo "" | ||
93 | fi | ||
94 | } | 75 | } |
95 | 76 | ||
96 | die() { | 77 | die() { |