diff --git a/archive/community.applications-2022.07.10-x86_64-1.txz b/archive/community.applications-2022.07.10-x86_64-1.txz new file mode 100644 index 00000000..5cbcf9a1 Binary files /dev/null and b/archive/community.applications-2022.07.10-x86_64-1.txz differ diff --git a/archive/community.applications-2022.07.11-x86_64-1.txz b/archive/community.applications-2022.07.11-x86_64-1.txz new file mode 100644 index 00000000..4273b29e Binary files /dev/null and b/archive/community.applications-2022.07.11-x86_64-1.txz differ diff --git a/archive/community.applications-2022.07.12-x86_64-1.txz b/archive/community.applications-2022.07.12-x86_64-1.txz new file mode 100644 index 00000000..7a0dcdb4 Binary files /dev/null and b/archive/community.applications-2022.07.12-x86_64-1.txz differ diff --git a/archive/community.applications-2022.07.13-x86_64-1.txz b/archive/community.applications-2022.07.13-x86_64-1.txz new file mode 100644 index 00000000..19b805c5 Binary files /dev/null and b/archive/community.applications-2022.07.13-x86_64-1.txz differ diff --git a/archive/community.applications-2022.07.16-x86_64-1.txz b/archive/community.applications-2022.07.16-x86_64-1.txz new file mode 100644 index 00000000..a2ea13d4 Binary files /dev/null and b/archive/community.applications-2022.07.16-x86_64-1.txz differ diff --git a/plugins/community.applications.plg b/plugins/community.applications.plg index 0d7a2d85..f5d11c22 100644 --- a/plugins/community.applications.plg +++ b/plugins/community.applications.plg @@ -2010,6 +2010,7 @@ echo "" echo "Adjusting icon for unRaid version" if [[ -e /usr/local/emhttp/plugins/dynamix/styles/font-cases.ttf ]]; then sed -i 's/f0db/e942/g' /usr/local/emhttp/plugins/community.applications/Apps.page; fi if [[ ! -e /usr/local/emhttp/plugins/dynamix/styles/font-cases.ttf ]]; then sed -i 's/e942/f0db/g' /usr/local/emhttp/plugins/community.applications/Apps.page; fi + echo "" echo "----------------------------------------------------" echo " &name; has been installed." diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page b/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page index 95006bda..fe39407e 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page @@ -784,7 +784,7 @@ function showSortIcons() { } function ca_openPlugin(cmd,title,plg,func) { - setTimeout(function(){openPlugin(cmd,title,plg,func);},250); + setTimeout(function(){openPlugin(cmd,title,plg,func,"");},250); } @@ -822,7 +822,9 @@ function updateContent(button) { $.removeCookie("ca_plugininstallpending"); myCloseAlert(); - ca_openPlugin('multiplugin install '+plugins,"",'','refresh'); + post({action:'saveMultiPluginPending',plugin:plugins},function(data) { + ca_openPlugin('multiplugin install '+plugins,"",'','refresh'); + }); openBox('/plugins//scripts/installMultiPlugin.php&arg1='+plugins,"",600,900,true); @@ -1197,7 +1199,9 @@ function actuallyInstallPlugin(pluginURL,update=false,comment="") { pluginURL.replace("&deprecated",""); } - ca_openPlugin('plugin '+type+' '+pluginURL,title,'',postFunction); + post({action:'saveMultiPluginPending',plugin:pluginURL},function(data) { + ca_openPlugin('plugin '+type+' '+pluginURL,title,'',postFunction); + }); openBox('/plugins/community.applications/scripts/pluginInstall.php&arg1='+type+'&arg2='+pluginURL,title,600,900,true,postFunction); @@ -1220,6 +1224,7 @@ function actuallyInstallPlugin(pluginURL,update=false,comment="") { } ca_openPlugin('plugin '+type+' '+pluginURL,title,'',postFunction); + openBox('/plugins/community.applications/scripts/pluginInstall.php&arg1='+type+'&arg2='+pluginURL,title,600,900,true,postFunction); @@ -1928,7 +1933,6 @@ function installMulti() { }); post({action:'saveMultiPluginPending',plugin:plugin},function(data) { - alert(plugin); ca_openPlugin('multiplugin install '+plugin,tr('Install '+makePlural("Application",pluginCount)),'','refresh'); }); diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 b/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 index c17a4d9a..5ce9fdae 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 @@ -1,14 +1,14 @@ -dbc557b8f37a8fda04fd617c0fd5c503 ./Apps.page +85b981e211b30b027549c3d9494e1618 ./Apps.page 4e55f7483b661af21a25b677179baffe ./CA_notices.page 42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page e718d7825dbdc96a17a915079222b098 ./default.cfg 07a72859c0c26030943adf8d379d4074 ./include/exec.php e564b860fa0d5022df83c103922665d7 ./include/helpers.php -d9bce32c48b39966cf5e5b6fdf6946ee ./include/paths.php +116042a918060278e77379b0dd73482c ./include/paths.php 532fffdf939594c143e679da02bd841e ./javascript/libraries.js 71f911a818d88d3d567f8a2898094ee2 ./README.md -aa1520f5576149b5f7734d4f280ba4ee ./scripts/caPostHook.php -b45c0067b64f05c3dafc202e423a3151 ./scripts/caPreHook.php +ff1fa32f5bc288631673066da4a36ebe ./scripts/caPostHook.php +981bc776ea83d2f15387e29870554e3f ./scripts/caPreHook.php d3d8286046cc7d6edf8f596067c163a2 ./scripts/checkForUpdates.php 99a9d58a49a7f6812f18bd4be2b563b9 ./scripts/checkForUpdates.sh 677ac9a29993ec57e09ec6a1856f1a11 ./scripts/dockerConvert.php diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/paths.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/paths.php index 798e85e7..50416574 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/paths.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/paths.php @@ -72,5 +72,5 @@ $caPaths['dockerSearchInstall'] = $caPaths['tempFiles']."/docker $caPaths['dockerSearchActive'] = $caPaths['tempFiles']."/dockerSearchActive"; $caPaths['SpotlightIcon'] = "https://raw.githubusercontent.com/Squidly271/community.applications/master/webImages/Unraid.svg"; $caPaths['dockerConvertFlash'] = $dockerManPaths['templates-user']."/my-CA_TEST_CONTAINER_DOCKERHUB.xml"; -$caPaths['pluginPending'] = "/tmp/community.applications/pluginPending/"; +$caPaths['pluginPending'] = "/tmp/plugins/pluginPending/"; ?> \ No newline at end of file diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/caPostHook.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/caPostHook.php index 237779a8..5db8463b 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/caPostHook.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/caPostHook.php @@ -1,8 +1,13 @@ #!/usr/bin/php \ No newline at end of file