From 23f2c73786e33e90f0dd11b9538c08bf98971bac Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 31 Oct 2018 23:49:19 +0100 Subject: [PATCH] yWeb: remove support for outdated dboxshot binary Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/0d9e76171a645288b816116eb7d67cbf1061dc6a Author: vanhofen Date: 2018-10-31 (Wed, 31 Oct 2018) Origin message was: ------------------ - yWeb: remove support for outdated dboxshot binary --- data/y-web/Y_Tools_Check_Install.yhtm | 6 ------ data/y-web/scripts/Y_Tools.sh | 9 +-------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/data/y-web/Y_Tools_Check_Install.yhtm b/data/y-web/Y_Tools_Check_Install.yhtm index b1794292a..6f6671eab 100644 --- a/data/y-web/Y_Tools_Check_Install.yhtm +++ b/data/y-web/Y_Tools_Check_Install.yhtm @@ -89,12 +89,6 @@ function do_check(){ ~ sLog_addRow(sLog_body, "green", "Programs: fbshot is installed at: {=var-get:fbshot=}. OSD Screenshot is enabled.", "ok"); =} - {=var-set:dboxshot={=find-exec:dboxshot=}=} - {=if-empty:{=var-get:dboxshot=}~ - sLog_addRow(sLog_body, "red", "Programs: dboxshot is not installed. Remote & OSD is disabled.", "failed"); - ~ - sLog_addRow(sLog_body, "green", "Programs: dboxshot is installed at: {=var-get:dboxshot=}. Remote & OSD is enabled.", "ok"); - =} {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ {=var-set:fcp={=find-exec:fcp=}=} diff --git a/data/y-web/scripts/Y_Tools.sh b/data/y-web/scripts/Y_Tools.sh index 009f8e626..9b5bf40db 100755 --- a/data/y-web/scripts/Y_Tools.sh +++ b/data/y-web/scripts/Y_Tools.sh @@ -479,7 +479,7 @@ do_lcshot() } # ----------------------------------------------------------- # osd shot -# $1= fbshot | grab | dbox bzw. leer +# $1= fbshot | grab # ----------------------------------------------------------- do_fbshot() { @@ -497,13 +497,6 @@ do_fbshot() else grab $* fi - else - shift 1 - if [ -e "$y_path_varbin/dboxshot" ]; then - $y_path_varbin/dboxshot $* - else - dboxshot $* - fi fi } # -----------------------------------------------------------