summaryrefslogtreecommitdiffstats
path: root/depends/util/src
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-09-30 22:52:55 +0200
committerPetr Mrázek <peterix@gmail.com>2015-09-30 22:52:55 +0200
commit477a1a88c6b7f5e5a78a2bbc4a6fe7781b2a0525 (patch)
tree8afd9d2359717b77c9c842b27598543af9069471 /depends/util/src
parentcf0308c970aba7e282e4e98782187bc636f8ce26 (diff)
downloadMultiMC-477a1a88c6b7f5e5a78a2bbc4a6fe7781b2a0525.tar
MultiMC-477a1a88c6b7f5e5a78a2bbc4a6fe7781b2a0525.tar.gz
MultiMC-477a1a88c6b7f5e5a78a2bbc4a6fe7781b2a0525.tar.lz
MultiMC-477a1a88c6b7f5e5a78a2bbc4a6fe7781b2a0525.tar.xz
MultiMC-477a1a88c6b7f5e5a78a2bbc4a6fe7781b2a0525.zip
GH-1262 fix relative paths for java binaries
Diffstat (limited to 'depends/util/src')
-rw-r--r--depends/util/src/pathutils.cpp18
1 files changed, 18 insertions, 0 deletions
diff --git a/depends/util/src/pathutils.cpp b/depends/util/src/pathutils.cpp
index 35c7f901..af1843ba 100644
--- a/depends/util/src/pathutils.cpp
+++ b/depends/util/src/pathutils.cpp
@@ -40,6 +40,24 @@ QString AbsolutePath(QString path)
return QFileInfo(path).absolutePath();
}
+QString ResolveExecutable(QString path)
+{
+ if (path.isEmpty())
+ {
+ return QString();
+ }
+ if(!path.contains('/'))
+ {
+ path = QStandardPaths::findExecutable(path);
+ }
+ QFileInfo pathInfo(path);
+ if(!pathInfo.exists() || !pathInfo.isExecutable())
+ {
+ return QString();
+ }
+ return pathInfo.absoluteFilePath();
+}
+
/**
* Normalize path
*