Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use qgetenv instead of QProcess/whoami to get username

Browse Source
This commit is contained in:
Jonas Kvinge 2019-08-22 21:38:54 +02:00
parent bd5ab80276
commit 0105a53765
2 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
3rdparty/singleapplication/singleapplication_p.cpp vendored
View File

@ -32,8 +32,8 @@
#include <cstdlib> #include <cstdlib>
#include <cstddef> #include <cstddef>
#include <QtGlobal>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QProcess>
#include <QtCore/QByteArray> #include <QtCore/QByteArray>
#include <QtCore/QSemaphore> #include <QtCore/QSemaphore>
#include <QtCore/QDataStream> #include <QtCore/QDataStream>
@ -113,18 +113,7 @@ void SingleApplicationPrivate::genBlockServerName()
} }
#endif #endif
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
QProcess process; appData.addData(qgetenv("USER"));
process.start( "whoami" );
if( process.waitForFinished( 100 ) &&
process.exitCode() == QProcess::NormalExit) {
appData.addData( process.readLine() );
} else {
appData.addData(
QDir(
QStandardPaths::standardLocations( QStandardPaths::HomeLocation ).first()
).absolutePath().toUtf8()
);
}
#endif #endif
} }

15
3rdparty/singleapplication/singlecoreapplication_p.cpp vendored
View File

@ -32,8 +32,8 @@
#include <cstdlib> #include <cstdlib>
#include <cstddef> #include <cstddef>
#include <QtGlobal>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QProcess>
#include <QtCore/QByteArray> #include <QtCore/QByteArray>
#include <QtCore/QSemaphore> #include <QtCore/QSemaphore>
#include <QtCore/QDataStream> #include <QtCore/QDataStream>
@ -113,18 +113,7 @@ void SingleCoreApplicationPrivate::genBlockServerName()
} }
#endif #endif
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
QProcess process; appData.addData(qgetenv("USER"));
process.start( "whoami" );
if( process.waitForFinished( 100 ) &&
process.exitCode() == QProcess::NormalExit) {
appData.addData( process.readLine() );
} else {
appData.addData(
QDir(
QStandardPaths::standardLocations( QStandardPaths::HomeLocation ).first()
).absolutePath().toUtf8()
);
}
#endif #endif
} }