UnRAIDES/unRAID-NerdTools
1
0
Fork 0
mirror of https://github.com/UnRAIDES/unRAID-NerdTools synced 2025-04-05 15:56:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

2023.03.06

Browse Source
This commit is contained in:
jsavargas 2023-03-06 00:22:22 -03:00
parent 841cd439c4
commit a515403c77
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
archive/NerdTools-2023.03.06-x86_64-1.txz Normal file
View File

Binary file not shown.

6
plugin/NerdTools.plg
View File

@ -3,8 +3,8 @@
<!DOCTYPE PLUGIN [ <!DOCTYPE PLUGIN [
<!ENTITY name "NerdTools"> <!ENTITY name "NerdTools">
<!ENTITY author "UnRAIDES"> <!ENTITY author "UnRAIDES">
<!ENTITY version "2023.03.05b"> <!ENTITY version "2023.03.06">
<!ENTITY md5 "f459a51d520c16a4753632066688d039"> <!ENTITY md5 "a1c1bb53b51d8ee81bad6867a35d2127">
<!ENTITY launch "Settings/&name;"> <!ENTITY launch "Settings/&name;">
<!ENTITY github "UnRAIDES/unRAID-&name;"> <!ENTITY github "UnRAIDES/unRAID-&name;">
<!ENTITY pluginURL "https://raw.githubusercontent.com/&github;/main/plugin/&name;.plg"> <!ENTITY pluginURL "https://raw.githubusercontent.com/&github;/main/plugin/&name;.plg">
@ -17,6 +17,8 @@
<CHANGES> <CHANGES>
##&name; ##&name;
###2023.03.06
- Fixed: fixed PHP deprecated:
###2023.03.05b ###2023.03.05b
- Initial 6.12 compatibility - Initial 6.12 compatibility
- Fixed: added some missing package descriptions - Fixed: added some missing package descriptions

1
source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdToolsHelpers.php
View File

@ -13,7 +13,6 @@ if (!is_dir($pkg_extra_path))
$pkg_desc = 'https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/packages-desc'; $pkg_desc = 'https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/packages-desc';
$pkg_repo = "https://api.github.com/repos/UnRAIDES/unRAID-NerdTools/contents/packages/$os_version"; $pkg_repo = "https://api.github.com/repos/UnRAIDES/unRAID-NerdTools/contents/packages/$os_version";
$pkg_repo = $_SERVER['HTTP_DEVELOP'] ? $pkg_repo = "https://api.github.com/repos/jsavargas/unRAID-NerdTools/contents/packages/$os_version?ref=develop" : $pkg_repo;
$desc_file = $pkg_path.'packages-desc'; $desc_file = $pkg_path.'packages-desc';
$repo_file = $pkg_path.'packages.json'; $repo_file = $pkg_path.'packages.json';

5
source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/PackageQuery.php
View File

@ -11,6 +11,7 @@ if (!file_exists($repo_file) || !empty($_GET['force']) || (filemtime($repo_file)
} }
$pkgs_array = []; $pkgs_array = [];
$pkg_nameArray = [];
foreach ($pkgs_github_array as $pkg_github) { foreach ($pkgs_github_array as $pkg_github) {
$pkg_nameArray = explode('-', $pkg_github['name']); // split package name into array $pkg_nameArray = explode('-', $pkg_github['name']); // split package name into array
@ -36,7 +37,7 @@ foreach ($pkgs_github_array as $pkg_github) {
// check all plugins for package dependency // check all plugins for package dependency
$plugins = []; $plugins = [];
exec("cd /boot/config/plugins ; find *.plg | xargs grep '${pkg_name}-${pkg_version}' -sl",$plugins); exec("cd /boot/config/plugins ; find *.plg | xargs grep '$pkg_name-$pkg_version' -sl",$plugins);
$pkg_plgs = '--'; $pkg_plgs = '--';
if ($plugins){ if ($plugins){
foreach ($plugins as $plugin){ foreach ($plugins as $plugin){
@ -59,6 +60,8 @@ foreach ($pkgs_github_array as $pkg_github) {
$downloadedpkg = !empty(preg_grep($pkg_pattern, $pkgs_installed)) ? array_values(preg_grep($pkg_pattern, $pkgs_installed))[0] : false; $downloadedpkg = !empty(preg_grep($pkg_pattern, $pkgs_installed)) ? array_values(preg_grep($pkg_pattern, $pkgs_installed))[0] : false;
$downloadedpkgv = $downloadedpkg ? preg_match('/^'.$pkg_name.'-(\d.+?)[-|_].*/',$downloadedpkg, $matches)? $matches[1]:false : false; $downloadedpkgv = $downloadedpkg ? preg_match('/^'.$pkg_name.'-(\d.+?)[-|_].*/',$downloadedpkg, $matches)? $matches[1]:false : false;
$updatePkg = version_compare($pkg_version, $downloadedpkgv, '>') ; $updatePkg = version_compare($pkg_version, $downloadedpkgv, '>') ;
if (!array_key_exists($pkg_name, $pkgs_desc_array)) $pkgs_desc_array[$pkg_name] = "";
$pkg = [ $pkg = [
'name' => str_replace("_nerdtools.txz",".txz",$pkg_github['name']) , // add full package name 'name' => str_replace("_nerdtools.txz",".txz",$pkg_github['name']) , // add full package name