Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 22f2c379569e8fe6d9da34c78957bd3260348a4b (commit)
from c9e59d02633e16dfe7fe08aefe99e678d89102fd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 22f2c379569e8fe6d9da34c78957bd3260348a4b
Author: GetAway <get...@t-...>
Date: Fri Apr 17 21:47:18 2015 +0200
yWeb:fix check presence of flash tools
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Check_Install.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Check_Install.yhtm
index 8a2df7e..c7fb634 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Check_Install.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Check_Install.yhtm
@@ -105,7 +105,7 @@ function do_check()
~
sLog_addRow(sLog_body, "green", "Programs: dboxshot is installed at: {=var-get:dboxshot=}. Remote & OSD is enabled.", "ok");
=}
- {=var-set:fcp={=find-exec:fcp=}=}{=var-set:fcp={=find-exec:flashcp=}=}
+ {=var-set:fcp={=if-empty:{=find-exec:fcp=}~{=if-empty:{=find-exec:flashcp=}~~{=find-exec:flashcp=}=}~{=find-exec:fcp=}=}=}
{=if-empty:{=var-get:fcp=}~
sLog_addRow(sLog_body, "red", "Programs: fcp is not installed. Image flashing is disabled. ", "failed");
~
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Flash_Upload.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Flash_Upload.yhtm
index daece4a..e651448 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Flash_Upload.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Flash_Upload.yhtm
@@ -21,8 +21,7 @@ function do_image_upload_ready()
</script>
</head>
<body>
-{=var-set:fcp={=find-exec:fcp=}=}
-{=var-set:fcp={=find-exec:flashcp=}=}
+{=var-set:fcp={=if-empty:{=find-exec:fcp=}~{=if-empty:{=find-exec:flashcp=}~~{=find-exec:flashcp=}=}~{=find-exec:fcp=}=}=}
{=var-set:wait_text={=L:4410=}=}{=include-block:Y_Blocks.txt;snip_wait=}
<div id="wait_flash" class="ydiagfree" style="left: 100px; position: absolute; top: 100px; display: none;">
<div class="y_wait_box_visible">
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 4b4b186..efe1e79 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.2.1
-date=15.04.2015
+version=2.8.2.2
+date=17.04.2015
type=Release
info=Tuxbox
-----------------------------------------------------------------------
Summary of changes:
.../daemons/nhttpd/web/Y_Tools_Check_Install.yhtm | 2 +-
.../daemons/nhttpd/web/Y_Tools_Flash_Upload.yhtm | 3 +--
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
--
Tuxbox-GIT: apps
|
