diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e8c39a..9750bb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,7 +61,6 @@ set(WEB_FILES web/3rdparty/bootstrap_dropdowns_enhancement/js/dropdowns-enhancement.js web/css/core.css web/css/dashboard.css - web/index.html web/js/client.js web/js/entrymanagement.js web/js/expandcollapse.js @@ -104,6 +103,12 @@ configure_file( ) include_directories("${PROJECT_BINARY_DIR}") +# insert meta data in index.html +configure_file( + "${PROJECT_SOURCE_DIR}/web/index.html" + "${PROJECT_BINARY_DIR}/web/index.html" +) + # add windows resource file if(MINGW) # create windows rc file from template @@ -164,6 +169,11 @@ foreach(WEB_FILE ${WEB_FILES}) COMPONENT web ) endforeach() +install( + FILES ${PROJECT_BINARY_DIR}/web/index.html + DESTINATION share/${META_PROJECT_NAME}/web + COMPONENT web +) if(NOT TARGET install-binary) add_custom_target(install-binary DEPENDS ${META_PROJECT_NAME} diff --git a/alpm/manager.cpp b/alpm/manager.cpp index 7268fc3..7d5b656 100644 --- a/alpm/manager.cpp +++ b/alpm/manager.cpp @@ -801,18 +801,18 @@ QString Manager::findDatabasePath(const QString &name, bool updatesRequired, boo QFileInfo dbPathRegular(m_config.storageDir() % QStringLiteral("/sync/") % name % QStringLiteral(".db")); QFileInfo dbPathWithFiles(m_config.storageDir() % QStringLiteral("/sync/") % name % QStringLiteral(".files")); if(dbPathWithFiles.isFile() && (!dbPathRegular.isFile() || dbPathWithFiles.lastModified() > dbPathRegular.lastModified())) { - return dbPathWithFiles.absolutePath(); + return dbPathWithFiles.absoluteFilePath(); } else if(dbPathRegular.isFile()) { - return dbPathRegular.absolutePath(); + return dbPathRegular.absoluteFilePath(); } else if(!updatesRequired) { // can't find database file in storage directory and database should not be updated automatically // -> it might be possible to use the databases from pacman QFileInfo pacmanDbPathRegular(m_config.alpmDbPath() % QStringLiteral("/sync/") % name % QStringLiteral(".db")); QFileInfo pacmanDbPathWithFiles(m_config.alpmDbPath() % QStringLiteral("/sync/") % name % QStringLiteral(".files")); if(pacmanDbPathWithFiles.isFile() && (!pacmanDbPathRegular.isFile() || pacmanDbPathWithFiles.lastModified() > pacmanDbPathRegular.lastModified())) { - return pacmanDbPathWithFiles.absolutePath(); + return pacmanDbPathWithFiles.absoluteFilePath(); } else if(pacmanDbPathRegular.isFile()) { - return pacmanDbPathRegular.absolutePath(); + return pacmanDbPathRegular.absoluteFilePath(); } } if(printError) { diff --git a/alpm/package.cpp b/alpm/package.cpp index 930d39e..8693565 100644 --- a/alpm/package.cpp +++ b/alpm/package.cpp @@ -326,8 +326,10 @@ QJsonObject Package::detailedInfo() const put(info, QStringLiteral("lic"), licenses()); put(info, QStringLiteral("grp"), groups()); put(info, QStringLiteral("prov"), provides()); - put(info, QStringLiteral("optd"), optionalDependencies()); put(info, QStringLiteral("deps"), dependencies()); + put(info, QStringLiteral("optd"), optionalDependencies()); + put(info, QStringLiteral("mkd"), makeDependencies()); + put(info, QStringLiteral("chkd"), checkDependencies()); put(info, QStringLiteral("requ"), requiredBy()); put(info, QStringLiteral("optf"), optionalFor()); put(info, QStringLiteral("conf"), conflicts()); diff --git a/web/index.html b/web/index.html index 76f8105..cd8e73f 100644 --- a/web/index.html +++ b/web/index.html @@ -12,7 +12,7 @@ - Repository index + @META_APP_NAME@ @@ -228,13 +228,13 @@