Squidly271/community.applications
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

below

Browse Source 
Better handling of curl download failures
When doing a multiple docker install, automatically download the icons when finished (speeds of access to the docker tab)
This commit is contained in:
Squidly271 2022-04-16 15:44:55 -04:00
parent a189daaa7c
commit 4b1fa7dcaa
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
archive/community.applications-2022.04.16-x86_64-1.txz
View File

Binary file not shown.

4
source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5
View File

@ -3,13 +3,13 @@
42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page
e718d7825dbdc96a17a915079222b098 ./default.cfg
4d685cb061a11b2e757af6c0ea49ecbf ./include/exec.php
a31856c2249edbc6c396b6f62540504c ./include/helpers.php
d5ba81dbd93c7b149dec96def31107e9 ./include/helpers.php
d9b0dc98ee598d44633341ac199a43e0 ./include/paths.php
532fffdf939594c143e679da02bd841e ./javascript/libraries.js
71f911a818d88d3d567f8a2898094ee2 ./README.md
79f3093f42415484944e6aa2863ee30a ./scripts/checkForUpdates.php
08c5dc26cf812f7de7d28b26856b04b1 ./scripts/dockerConvert.php
f69708d36e7f856c0ee95f89b9c68a6b ./scripts/installMulti.php
07684bde8ccd13523f62c69bb492fc27 ./scripts/installMulti.php
be74e770cdc8938200fc29580be4e3a1 ./scripts/installMultiPlugin.php
524afab04ca930f59117a846f819fb2f ./scripts/installPluginUpdate.sh
5319e550a7b7a1c216eda8c7f2f0f4ef ./scripts/installUpdate.php

1
source/community.applications/usr/local/emhttp/plugins/community.applications/include/helpers.php
View File

@ -78,6 +78,7 @@ function download_url($url, $path = "", $bg = false, $timeout = 45) {
curl_setopt($ch,CURLOPT_ENCODING,"");
curl_setopt($ch,CURLOPT_RETURNTRANSFER,true);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($ch, CURLOPT_FAILONERROR,true);
if ( is_file("/boot/config/plugins/community.applications/proxy.cfg") ) {
$proxyCFG = parse_ini_file("/boot/config/plugins/community.applications/proxy.cfg");

4
source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/installMulti.php
View File

@ -17,6 +17,7 @@ $_SERVER['REQUEST_URI'] = "docker/apps";
require_once "$docroot/plugins/community.applications/include/paths.php";
require_once "$docroot/plugins/dynamix/include/Wrappers.php";
require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
$unRaidVersion = parse_ini_file($caPaths['unRaidVersion']);
@ -110,6 +111,9 @@ function addCloseButton() {
file_put_contents("/var/lib/docker/unraid-autostart",$autostartFile);
}
echo "<br>".tr("Downloading docker icons")."<br>";
$DockerTemplates->getAllInfo();
if ( $failFlag || !$_GET['plugin']) {
echo "<br>".tr("Docker Application Installation finished")."<br><script>addCloseButton();</script>";
} else {