diff options
| author | Christopher Roy Bratusek <nano@jpberlin.de> | 2015-03-26 21:34:09 +0100 |
|---|---|---|
| committer | Christopher Roy Bratusek <nano@jpberlin.de> | 2015-03-26 21:34:09 +0100 |
| commit | 5cc71e5b53251ff8ffc145bc94dc4d4efbd3ee31 (patch) | |
| tree | 2ad732708e138fcce2eb67351b3e5628a51b5c9a /libLumina | |
| parent | - updated debian/changelog (diff) | |
| parent | Streamline quite a bit of the background worker: (diff) | |
| download | lumina-5cc71e5b53251ff8ffc145bc94dc4d4efbd3ee31.tar.gz lumina-5cc71e5b53251ff8ffc145bc94dc4d4efbd3ee31.tar.bz2 lumina-5cc71e5b53251ff8ffc145bc94dc4d4efbd3ee31.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
libLumina/LuminaOS-Debian.cpp
Diffstat (limited to 'libLumina')
| -rw-r--r-- | libLumina/LuminaOS-Debian.cpp | 2 | ||||
| -rw-r--r-- | libLumina/LuminaOS-DragonFly.cpp | 2 | ||||
| -rw-r--r-- | libLumina/LuminaOS-FreeBSD.cpp | 3 | ||||
| -rw-r--r-- | libLumina/LuminaOS-Linux.cpp | 2 | ||||
| -rw-r--r-- | libLumina/LuminaOS-OpenBSD.cpp | 2 | ||||
| -rw-r--r-- | libLumina/LuminaOS-kFreeBSD.cpp | 2 | ||||
| -rw-r--r-- | libLumina/LuminaOS-template.cpp | 2 |
7 files changed, 8 insertions, 7 deletions
diff --git a/libLumina/LuminaOS-Debian.cpp b/libLumina/LuminaOS-Debian.cpp index f1048347..7ce8250f 100644 --- a/libLumina/LuminaOS-Debian.cpp +++ b/libLumina/LuminaOS-Debian.cpp @@ -209,7 +209,7 @@ QStringList LOS::Checksums(QStringList filepaths){ //Return: checksum of the inp //file system capacity QString LOS::FileSystemCapacity(QString dir) { //Return: percentage capacity as give by the df command - QStringList mountInfo = LUtils::getCmdOutput("df -h " + dir); + QStringList mountInfo = LUtils::getCmdOutput("df -h \"" + dir + "\""); QString::SectionFlag skipEmpty = QString::SectionSkipEmpty; //output: 200G of 400G available on /mount/point QString capacity = mountInfo[1].section(" ",3,3, skipEmpty) + " of " + mountInfo[1].section(" ",1,1, skipEmpty) + " available on " + mountInfo[1].section(" ",5,5, skipEmpty); diff --git a/libLumina/LuminaOS-DragonFly.cpp b/libLumina/LuminaOS-DragonFly.cpp index 2e4ae358..b9ba58a2 100644 --- a/libLumina/LuminaOS-DragonFly.cpp +++ b/libLumina/LuminaOS-DragonFly.cpp @@ -178,7 +178,7 @@ QStringList LOS::Checksums(QStringList filepaths){ //Return: checksum of the inp //file system capacity QString LOS::FileSystemCapacity(QString dir) { //Return: percentage capacity as give by the df command - QStringList mountInfo = LUtils::getCmdOutput("df " + dir); + QStringList mountInfo = LUtils::getCmdOutput("df \"" + dir+"\""); QString::SectionFlag skipEmpty = QString::SectionSkipEmpty; //we take the 5th word on the 2 line QString capacity = mountInfo[1].section(" ",4,4, skipEmpty); diff --git a/libLumina/LuminaOS-FreeBSD.cpp b/libLumina/LuminaOS-FreeBSD.cpp index dfc413b4..fc4135f0 100644 --- a/libLumina/LuminaOS-FreeBSD.cpp +++ b/libLumina/LuminaOS-FreeBSD.cpp @@ -198,10 +198,11 @@ QStringList LOS::Checksums(QStringList filepaths){ //Return: checksum of the inp //file system capacity QString LOS::FileSystemCapacity(QString dir) { //Return: percentage capacity as give by the df command - QStringList mountInfo = LUtils::getCmdOutput("df " + dir); + QStringList mountInfo = LUtils::getCmdOutput("df \"" + dir+"\""); QString::SectionFlag skipEmpty = QString::SectionSkipEmpty; //we take the 5th word on the 2 line QString capacity = mountInfo[1].section(" ",4,4, skipEmpty); return capacity; +} #endif diff --git a/libLumina/LuminaOS-Linux.cpp b/libLumina/LuminaOS-Linux.cpp index 9b4048d1..97c29bfb 100644 --- a/libLumina/LuminaOS-Linux.cpp +++ b/libLumina/LuminaOS-Linux.cpp @@ -206,7 +206,7 @@ QStringList LOS::Checksums(QStringList filepaths){ //Return: checksum of the inp //file system capacity QString LOS::FileSystemCapacity(QString dir) { //Return: percentage capacity as give by the df command - QStringList mountInfo = LUtils::getCmdOutput("df " + dir); + QStringList mountInfo = LUtils::getCmdOutput("df \"" + dir+"\""); QString::SectionFlag skipEmpty = QString::SectionSkipEmpty; //we take the 5th word on the 2 line QString capacity = mountInfo[1].section(" ",4,4, skipEmpty); diff --git a/libLumina/LuminaOS-OpenBSD.cpp b/libLumina/LuminaOS-OpenBSD.cpp index dc8df0a7..df6ddeba 100644 --- a/libLumina/LuminaOS-OpenBSD.cpp +++ b/libLumina/LuminaOS-OpenBSD.cpp @@ -215,7 +215,7 @@ QString LOS::FileSystemCapacity(QString dir) { //>Filesystem 512-blocks Used Avail Capacity Mounted on //>/dev/sd2l 14334588 739900 12877960 5% /home - QStringList mountInfo = LUtils::getCmdOutput("df " + dir); + QStringList mountInfo = LUtils::getCmdOutput("df \"" + dir+"\""); QString::SectionFlag skipEmpty = QString::SectionSkipEmpty; //we take the 5th word on the 2 line QString capacity = mountInfo[1].section(" ",4,4, skipEmpty); diff --git a/libLumina/LuminaOS-kFreeBSD.cpp b/libLumina/LuminaOS-kFreeBSD.cpp index b0c98abb..2b24ce51 100644 --- a/libLumina/LuminaOS-kFreeBSD.cpp +++ b/libLumina/LuminaOS-kFreeBSD.cpp @@ -160,7 +160,7 @@ QStringList LOS::Checksums(QStringList filepaths){ //Return: checksum of the inp //file system capacity QString LOS::FileSystemCapacity(QString dir) { //Return: percentage capacity as give by the df command - return QString; + return QString(); } #endif diff --git a/libLumina/LuminaOS-template.cpp b/libLumina/LuminaOS-template.cpp index 38e54816..dfb9d850 100644 --- a/libLumina/LuminaOS-template.cpp +++ b/libLumina/LuminaOS-template.cpp @@ -108,7 +108,7 @@ QStringList LOS::Checksums(QStringList filepaths){ //Return: checksum of the inp //file system capacity QString LOS::FileSystemCapacity(QString dir) { //Return: percentage capacity as give by the df command - return QString; + return QString(); } #endif |