From 51db7b1e360dce113cff58b05233bd9715618394 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Sat, 16 Jun 2012 21:57:24 +0000 Subject: [PATCH] fix stripped icon git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1070 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 4 ++-- var/mongoose/cgi-bin/browse/shrunk.jim | 9 ++------- var/mongoose/lib/bin/auto | 2 ++ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index 66a77b2b..462533a9 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,9 +1,9 @@ Package: webif Priority: optional Section: web -Version: 0.9.12 +Version: 0.9.12-2 Architecture: mipsel Maintainer: af123@hummypkg.org.uk -Depends: webif-channelicons(>=1.0.1),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.0.3) +Depends: webif-channelicons(>=1.0.1),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.0.4) Suggests: ffmpeg,webif-iphone Description: An evolving web interface for the Humax. diff --git a/var/mongoose/cgi-bin/browse/shrunk.jim b/var/mongoose/cgi-bin/browse/shrunk.jim index bc92b491..18c7ab20 100755 --- a/var/mongoose/cgi-bin/browse/shrunk.jim +++ b/var/mongoose/cgi-bin/browse/shrunk.jim @@ -17,16 +17,11 @@ foreach file [readdir -nocomplain $dir] { if {![string match {*.ts} $file]} { continue } regsub -all {([\\["$])} [file rootname $file] {\\\1} xfile - if {[catch {set perc [exec /mod/bin/stripts -Aq "$xdir/$xfile"]}]} { + if {[catch {set eit [exec /mod/bin/stripts -cq "$xdir/$xfile"]}]} { continue } - if {[string match {*%} $perc]} { - set perc [string range $perc 0 end-1] - } else { - set perc 0 - } - puts " \"$file\": $perc," + puts " \"$file\": $eit," } puts " \"dummy\": 0" puts "}" diff --git a/var/mongoose/lib/bin/auto b/var/mongoose/lib/bin/auto index 2824b57e..2d4dedc3 100755 --- a/var/mongoose/lib/bin/auto +++ b/var/mongoose/lib/bin/auto @@ -187,6 +187,8 @@ proc scan {dir attr} {{indent 0}} { #puts "[string repeat " " $indent]\[$dir]" + if {[string match {\[*} $dir]} continue + if {[file exists "$dir/.auto$attr"]} { $attr $dir } foreach entry [readdir -nocomplain $dir] {