3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-04-29 02:07:55 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #196 from airdrummingfool/which

Browse source 
Use "which" instead of "whereis" to find the streaming executable
This commit is contained in:
Johannes Pohl 2017-03-01 19:39:27 +01:00 • committed by GitHub
commit 3ce22da8f4
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
server/streamreader/processStream.cpp
View file

@ -45,7 +45,7 @@ ProcessStream::~ProcessStream()
}
bool ProcessStream::fileExists(const std::string& filename)
bool ProcessStream::fileExists(const std::string& filename)
{
struct stat buffer;
return (stat(filename.c_str(), &buffer) == 0);
@ -62,14 +62,10 @@ std::string ProcessStream::findExe(const std::string& filename)
if (exe.find("/") != string::npos)
exe = exe.substr(exe.find_last_of("/") + 1);
/// check with "whereis"
string whereis = execGetOutput("whereis " + exe);
if (whereis.find(":") != std::string::npos)
{
whereis = trim_copy(whereis.substr(whereis.find(":") + 1));
if (!whereis.empty())
return whereis;
}
/// check with "which"
string which = execGetOutput("which " + exe);
if (!which.empty())
return which;
/// check in the same path as this binary
char buff[PATH_MAX];