From 24d26aee75f79876395cfdf1170d3ce26ee9c571 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Sat, 4 Aug 2012 00:29:57 +0000 Subject: [PATCH] update to 0.9.13 git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1100 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- var/mongoose/cgi-bin/browse/file.jim | 29 ++++ var/mongoose/html/img/tree/minustop.png | Bin 0 -> 238 bytes var/mongoose/html/img/tree/plusonly.png | Bin 0 -> 242 bytes var/mongoose/html/pkg/index.shtml | 60 ++++++++ var/mongoose/{cgi-bin => html/pkg}/pkg.jim | 15 +- .../html/{pkg.shtml => pkg/script.js} | 135 +++++++----------- var/mongoose/html/pkg/style.css | 16 +++ var/mongoose/include/menuicons.jim | 2 +- var/mongoose/include/toolbar.jim | 2 +- var/mongoose/lib/bin/auto | 4 +- var/mongoose/lib/ts.class | 6 + 12 files changed, 174 insertions(+), 97 deletions(-) create mode 100644 var/mongoose/html/img/tree/minustop.png create mode 100644 var/mongoose/html/img/tree/plusonly.png create mode 100644 var/mongoose/html/pkg/index.shtml rename var/mongoose/{cgi-bin => html/pkg}/pkg.jim (85%) rename var/mongoose/html/{pkg.shtml => pkg/script.js} (52%) create mode 100644 var/mongoose/html/pkg/style.css diff --git a/CONTROL/control b/CONTROL/control index 8db34f2..41793f6 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 0.9.12-7 +Version: 0.9.13 Architecture: mipsel Maintainer: af123@hummypkg.org.uk Depends: webif-channelicons(>=1.0.2),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.1.2) diff --git a/var/mongoose/cgi-bin/browse/file.jim b/var/mongoose/cgi-bin/browse/file.jim index fe535c6..1885edc 100755 --- a/var/mongoose/cgi-bin/browse/file.jim +++ b/var/mongoose/cgi-bin/browse/file.jim @@ -91,6 +91,23 @@ if {$url ne ""} { $url" } puts " + + Files + +" + +set fileset [$ts fileset] +puts -nonewline "" +puts -nonewline "[llength $fileset] file" +if {[llength $fileset] != 1} { puts -nonewline "s" } +puts -nonewline " in set." +puts "" + +puts " Flags [$ts get flags] @@ -101,6 +118,18 @@ if {[$ts get bookmarks]} { puts "" puts "" + puts { + + } exit } diff --git a/var/mongoose/html/img/tree/minustop.png b/var/mongoose/html/img/tree/minustop.png new file mode 100644 index 0000000000000000000000000000000000000000..8625291b7b9e031a18bd88cf6617a84e9bf8a681 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc%)r2SHsJ0`AcrO0(btiIVf_hn)~=U8zGR7O zL`iUdT1k0gQ7VIDN`6wRf@f}GdTLN=VoGJ<$y6JlBF+Gx5Z4J4CIFfL|Nrk~@K*$~ zm`j5Eg8%<#xPFQkXdpw3r;B4q#jT`-q@*Nbp-cFd3xj7l)Aayn$0a~}7(8A5T-G@yGywpKU`1*G literal 0 HcmV?d00001 diff --git a/var/mongoose/html/img/tree/plusonly.png b/var/mongoose/html/img/tree/plusonly.png new file mode 100644 index 0000000000000000000000000000000000000000..7370769a44dce5b5bc894f1b2fdf83ec02c05cc5 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc%)r2SHsJ0`AcrO0(btiIVf_hn)~=U8zGR7O zL`iUdT1k0gQ7VIDN`6wRf@f}GdTLN=VoGJ<$y6JlBF+Gx5Z4J4CIFfL|Nrk~@K*$~ zm`j5Eg8%<#xPFQkXdpv^r;B4q#jT`-q$D6_Nm5g5U|>pOQ%Fc+;!qG^S2=Uw!~qro z2LrP*A%zA7m7bFf7x~hRjEtHLyEJ$hSOg4xR_K+m_VgTC-OAL!;G8r`_e8@oCcP6L gTNKP@`KU88c=#|~ZCpGFXcYs4r>mdKI;Vst0I + + + +
+

+ Package Management +

+ + + + +
+ + + + + + + + + + + + diff --git a/var/mongoose/cgi-bin/pkg.jim b/var/mongoose/html/pkg/pkg.jim similarity index 85% rename from var/mongoose/cgi-bin/pkg.jim rename to var/mongoose/html/pkg/pkg.jim index b64dc92..f5eeafc 100755 --- a/var/mongoose/cgi-bin/pkg.jim +++ b/var/mongoose/html/pkg/pkg.jim @@ -17,10 +17,15 @@ if {![dict exists $_cgi type]} { set _cgi(type) avail } proc pkgrow {pkg} { set name [$pkg get name] - altrow - puts " - $name - " + altrow "pkg=\"$name\"" + puts "$name" + if {$::type eq "inst"} { + puts "
   + + Info" + } + puts "" if {$::type eq "avail"} { puts "[$pkg get latest]" @@ -46,7 +51,7 @@ proc pkgrow {pkg} { set type Remove } - puts "" diff --git a/var/mongoose/html/pkg.shtml b/var/mongoose/html/pkg/script.js similarity index 52% rename from var/mongoose/html/pkg.shtml rename to var/mongoose/html/pkg/script.js index 9371057..11b34bf 100644 --- a/var/mongoose/html/pkg.shtml +++ b/var/mongoose/html/pkg/script.js @@ -1,63 +1,9 @@ - - - - -
-

Package Management

- - - - -
- - - - - - - - - - - diff --git a/var/mongoose/html/pkg/style.css b/var/mongoose/html/pkg/style.css new file mode 100644 index 0000000..a33fc18 --- /dev/null +++ b/var/mongoose/html/pkg/style.css @@ -0,0 +1,16 @@ +button.install +{ + display: none; + background-image: none; + background: #ccff99; +} +button.remove +{ + display: none; + background-image: none; + background: #ff6666; +} +button.upgrade +{ + display: none; +} diff --git a/var/mongoose/include/menuicons.jim b/var/mongoose/include/menuicons.jim index b1fff12..8671ca2 100755 --- a/var/mongoose/include/menuicons.jim +++ b/var/mongoose/include/menuicons.jim @@ -43,7 +43,7 @@ puts {
} menuitem "Service Management" "/img/spanner.png" \ /services.shtml 217 228 menuitem "Package Management" "/img/packages.png" \ - /pkg.shtml 217 228 + /pkg/index.shtml 217 228 menuitem "Settings" "/images/326_1_00_Menu_Settings.png" \ /cgi-bin/settings.jim 217 228 menuitem "Diagnostics" "/img/diagnostics.png" \ diff --git a/var/mongoose/include/toolbar.jim b/var/mongoose/include/toolbar.jim index 029d5f2..f3e9640 100755 --- a/var/mongoose/include/toolbar.jim +++ b/var/mongoose/include/toolbar.jim @@ -39,7 +39,7 @@ tb "/images/323_1_10_Menu_Video.png" "Browse" "/cgi-bin/browse.jim" tb "/images/321_1_00_Menu_CHList.png" "Schedule" "/sched/sched.jim" tb "/images/328_1_26_Menu_TV_Guide.png" "EPG" $epglink tb "/img/spanner.png" "Services" "/services.shtml" -tb "/img/packages.png" "Packages" "/pkg.shtml" +tb "/img/packages.png" "Packages" "/pkg/index.shtml" tb "/images/326_1_00_Menu_Settings.png" "Settings" "/cgi-bin/settings.jim" tb "/img/diagnostics.png" "Diag" "/diag/diag.jim" eval_plugins toolbar diff --git a/var/mongoose/lib/bin/auto b/var/mongoose/lib/bin/auto index 252b08a..ab0037e 100755 --- a/var/mongoose/lib/bin/auto +++ b/var/mongoose/lib/bin/auto @@ -52,7 +52,7 @@ proc do_shrink {ts} { set file [file rootname [$ts get file]] if {[catch { - set perc [exec /mod/bin/stripts -aq [escape $file]] + set perc [exec /mod/bin/stripts -aq $file] } msg]} { puts " Error: $msg" return @@ -71,7 +71,7 @@ proc do_shrink {ts} { puts " Estimate $perc% saving." puts " Shrinking..." if {[catch { - puts [exec /mod/bin/stripts -q [escape $file] $tmp/shrunk] + puts [exec /mod/bin/stripts -q $file $tmp/shrunk] } msg]} { puts "Error during shrink: $msg" return diff --git a/var/mongoose/lib/ts.class b/var/mongoose/lib/ts.class index 92fcbd5..7a857c6 100644 --- a/var/mongoose/lib/ts.class +++ b/var/mongoose/lib/ts.class @@ -157,6 +157,12 @@ ts method copy {dst} { return 1 } +ts method fileset {} { + set root [file rootname $file] + regsub -all {([\\["$])} $root {\\\1} root + return [glob -nocomplain "${root}.*"] +} + ts method settitle {newtitle} { if {[string length newtitle] > 48} { return }