diff options
-rw-r--r-- | mainwindow.cpp | 9 | ||||
-rw-r--r-- | mainwindow.ui | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/mainwindow.cpp b/mainwindow.cpp index 3321339e..e6b485d2 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -33,6 +33,7 @@ void MainWindow::checkConfig() { passStore = settings.value("passStore").toString(); if (passStore == "") { passStore = QDir::homePath()+"/.password-store/"; + /** @TODO exists? */ } passExecutable = settings.value("passExecutable").toString(); @@ -40,7 +41,7 @@ void MainWindow::checkConfig() { process->start("which pass"); process->waitForFinished(); if (process->exitCode() == 0) { - passExecutable = process->readAllStandardOutput(); + passExecutable = process->readAllStandardOutput().trimmed(); usePass = true; } } @@ -50,7 +51,7 @@ void MainWindow::checkConfig() { process->start("which git"); process->waitForFinished(); if (process->exitCode() == 0) { - gitExecutable = process->readAllStandardOutput(); + gitExecutable = process->readAllStandardOutput().trimmed(); } } @@ -63,7 +64,7 @@ void MainWindow::checkConfig() { process->waitForFinished(); } if (process->exitCode() == 0) { - gpgExecutable = process->readAllStandardOutput(); + gpgExecutable = process->readAllStandardOutput().trimmed(); } } @@ -156,7 +157,7 @@ void MainWindow::executePass(QString args) { */ void MainWindow::executeWrapper(QString args) { process->setWorkingDirectory(passStore); - process->start("bash", QStringList() << "-c" << args); + process->start("sh", QStringList() << "-c" << args); process->waitForFinished(); QString output = process->readAllStandardError(); if (output.size() > 0) { diff --git a/mainwindow.ui b/mainwindow.ui index 1ec2acf5..947ffffc 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>437</width> - <height>347</height> + <width>522</width> + <height>362</height> </rect> </property> <property name="windowTitle"> |