Page MenuHome GnuPG
Files F23020383

No OneTemporary
Actions

View Options

diff --git a/util.cpp b/util.cpp
index bb19dcc..74c84c1 100644
--- a/util.cpp
+++ b/util.cpp
@@ -1,110 +1,114 @@
#include <QDebug>
#include <QFileInfo>
#include <QProcessEnvironment>
#include <QString>
#include <QDir>
#include "util.h"
QProcessEnvironment Util::_env;
bool Util::_envInitialised;
/**
* @brief Util::initialiseEnvironment
*/
void Util::initialiseEnvironment()
{
if (!_envInitialised) {
_env = QProcessEnvironment::systemEnvironment();
#ifdef __APPLE__
// TODO checks here
QString path = _env.value("PATH");
if (!path.contains("/usr/local/MacGPG2/bin") && QFile("/usr/local/MacGPG2/bin").exists()) {
path += ":/usr/local/MacGPG2/bin";
}
if (!path.contains("/usr/local/bin")) {
path += ":/usr/local/bin";
}
_env.insert("PATH", path);
#endif
_envInitialised = true;
}
}
/**
* @brief Util::findPasswordStore
* @return
*/
QString Util::findPasswordStore()
{
QString path;
initialiseEnvironment();
if (_env.contains("PASSWORD_STORE_DIR")) {
path = _env.value("PASSWORD_STORE_DIR");
} else {
path = QDir::homePath()+"/.password-store/";
}
return Util::normalizeFolderPath(path);
}
/**
* @brief Util::normalizeFolderPath
* @param path
* @return
*/
QString Util::normalizeFolderPath(QString path) {
- if (!path.endsWith("/") && !path.endsWith(QDir::separator())) {
- path += '/';
+ if (!path.endsWith(QDir::separator())) {
+ path += QDir::separator();
}
return path;
}
QString Util::findBinaryInPath(QString binary)
{
initialiseEnvironment();
QString ret = "";
- binary.prepend("/");
+ binary.prepend(QDir::separator());
if (_env.contains("PATH")) {
QString path = _env.value("PATH");
- QStringList entries = path.split(':');
+ QStringList entries;
+#ifndef Q_OS_WIN
+ entries = path.split(':');
if (entries.length() < 2) {
+#endif
entries = path.split(';');
+#ifndef Q_OS_WIN
}
+#endif
foreach(QString entry, entries) {
QScopedPointer<QFileInfo> qfi(new QFileInfo(entry.append(binary)));
- qDebug() << entry;
-
#ifdef Q_OS_WIN
if (!qfi->exists()) {
qfi.reset(new QFileInfo(entry.append(".exe")));
}
#endif
+ qDebug() << entry;
if (!qfi->isExecutable()) {
continue;
}
ret = qfi->absoluteFilePath();
break;
}
}
return ret;
}
/**
* @brief Util::checkConfig
* @param passStore
* @param passExecutable
* @param gpgExecutable
* @return
*/
bool Util::checkConfig(QString passStore, QString passExecutable, QString gpgExecutable)
{
return !QFile(passStore + ".gpg-id").exists() || (!QFile(passExecutable).exists() && !QFile(gpgExecutable).exists());
}

File Metadata

Mime Type
text/x-diff
Expires
Mon, May 12, 6:10 PM (12 h, 36 m)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
ba/92/4f70506688f43ba844829119141b

Event Timeline