diff --git a/archive/NerdTools-2023.03.06-x86_64-1.txz b/archive/NerdTools-2023.03.06-x86_64-1.txz new file mode 100644 index 0000000..c995100 Binary files /dev/null and b/archive/NerdTools-2023.03.06-x86_64-1.txz differ diff --git a/plugin/NerdTools.plg b/plugin/NerdTools.plg index d0cacdf..28c556f 100644 --- a/plugin/NerdTools.plg +++ b/plugin/NerdTools.plg @@ -3,8 +3,8 @@ - - + + @@ -17,6 +17,8 @@ ##&name; +###2023.03.06 +- Fixed: fixed PHP deprecated: ###2023.03.05b - Initial 6.12 compatibility - Fixed: added some missing package descriptions diff --git a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdToolsHelpers.php b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdToolsHelpers.php index d608f4b..c5ade45 100644 --- a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdToolsHelpers.php +++ b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdToolsHelpers.php @@ -13,7 +13,6 @@ if (!is_dir($pkg_extra_path)) $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 = $_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'; $repo_file = $pkg_path.'packages.json'; diff --git a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/PackageQuery.php b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/PackageQuery.php index 02a86dd..06b1c14 100644 --- a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/PackageQuery.php +++ b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/PackageQuery.php @@ -11,6 +11,7 @@ if (!file_exists($repo_file) || !empty($_GET['force']) || (filemtime($repo_file) } $pkgs_array = []; +$pkg_nameArray = []; foreach ($pkgs_github_array as $pkg_github) { $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 $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 = '--'; if ($plugins){ 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; $downloadedpkgv = $downloadedpkg ? preg_match('/^'.$pkg_name.'-(\d.+?)[-|_].*/',$downloadedpkg, $matches)? $matches[1]:false : false; $updatePkg = version_compare($pkg_version, $downloadedpkgv, '>') ; + + if (!array_key_exists($pkg_name, $pkgs_desc_array)) $pkgs_desc_array[$pkg_name] = ""; $pkg = [ 'name' => str_replace("_nerdtools.txz",".txz",$pkg_github['name']) , // add full package name