diff --git a/CONTROL/control b/CONTROL/control index a5e8227..57fbd22 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,9 +1,9 @@ Package: webif Priority: optional Section: web -Version: 1.0.2 +Version: 1.0.3 Architecture: mipsel Maintainer: af123@hummypkg.org.uk -Depends: webif-channelicons(>=1.0.5),mongoose(>=3.0-8),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73-1),jim-cgi(>=0.7),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.2.1),smartmontools,tmenu(>=1.05),ffmpeg,id3v2 +Depends: webif-channelicons(>=1.0.6),mongoose(>=3.0-9),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73-1),jim-cgi(>=0.7),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.2.1),smartmontools,tmenu(>=1.05),ffmpeg,id3v2 Suggests: Description: An evolving web interface for the Humax. diff --git a/CONTROL/postinst b/CONTROL/postinst index 2a59572..5706610 100755 --- a/CONTROL/postinst +++ b/CONTROL/postinst @@ -6,25 +6,22 @@ export tmpf=/tmp/cronf.$$ # Add cron jobs -crond=$PKG_ROOT/var/spool/cron/crontabs -[ -d $crond ] || exit 1 - -cronf=$crond/root -grep -v webif/lib/bin/auto $cronf > $tmpf -( - cat $tmpf - echo '*/10 * * * * /mod/webif/lib/bin/auto >/dev/null 2>&1' -) > $cronf +crontab=$PKG_ROOT/bin/crontab +if [ -x $crontab ]; then + $crontab -l | grep -v webif/lib/bin/auto > $tmpf + cat $tmpf - << EOM | $crontab - +*/10 * * * * /mod/webif/lib/bin/auto >/dev/null 2>&1 +EOM +fi # Add anacron jobs ana=$PKG_ROOT/etc/anacrontab -egrep -v 'backup/backup.jim|diskattrs' $ana > $tmpf -( - cat $tmpf - echo "1 8 sched_backup /mod/var/mongoose/cgi-bin/backup/backup.jim" - echo "1 5 diskattrs /mod/webif/lib/bin/diskattrs" -) > $ana +egrep -v 'backup/backup.jim|bin/diskattrs' $ana > $tmpf +cat $tmpf - << EOM > $ana +1 8 sched_backup /mod/webife/cgi-bin/backup/backup.jim +1 5 diskattrs /mod/webif/lib/bin/diskattrs +EOM $PKG_ROOT/etc/init.d/S02anacron start < /dev/null > /dev/null 2>&1 & @@ -41,5 +38,7 @@ fi /mod/webif/lib/bin/diskattrs +[ -f $tmpf ] && rm -f $tmpf + exit 0 diff --git a/CONTROL/prerm b/CONTROL/prerm index c2fd54d..ce2dc08 100755 --- a/CONTROL/prerm +++ b/CONTROL/prerm @@ -2,16 +2,17 @@ export tmpf=/tmp/cronf.$$ -cronf=$PKG_ROOT/var/spool/cron/crontabs/root -if [ -f $cronf ]; then - grep -v webif/lib/bin/auto $cronf > $tmpf - cp $tmpf $cronf - [ -s $cronf ] || rm -f $cronf +crontab=$PKG_ROOT/bin/crontab +if [ -x $crontab ]; then + $crontab -l | grep -v webif/lib/bin/auto > $tmpf + [ -s $tmpf ] && $crontab $tmpf || $crontab -r fi ana=/mod/etc/anacrontab -egrep -v 'backup/backup.jim|diskattrs' $ana > $tmpf +egrep -v 'backup/backup.jim|bin/diskattrs' $ana > $tmpf cp $tmpf $ana +[ -f $tmpf ] && rm -f $tmpf + exit 0 diff --git a/var/mongoose/cgi-bin/xepg.jim b/var/mongoose/cgi-bin/xepg.jim index 4dbc291..86761a6 100755 --- a/var/mongoose/cgi-bin/xepg.jim +++ b/var/mongoose/cgi-bin/xepg.jim @@ -123,7 +123,7 @@ foreach e $records { puts "[$e channel_icon 30] " puts "$chnum - [$e get channel_name] " diff --git a/var/mongoose/html/browse/assets.jim b/var/mongoose/html/browse/assets.jim index 9831c90..a3b763e 100755 --- a/var/mongoose/html/browse/assets.jim +++ b/var/mongoose/html/browse/assets.jim @@ -268,7 +268,7 @@ puts { - diff --git a/var/mongoose/html/browse/index.jim b/var/mongoose/html/browse/index.jim index 4f90f59..b22a197 100755 --- a/var/mongoose/html/browse/index.jim +++ b/var/mongoose/html/browse/index.jim @@ -268,7 +268,7 @@ set stub "" foreach part [split $dir /] { if {$stub eq "/"} { set name $part } else { set name "/$part" } append stub $name - puts "$name + puts "$name } puts "" puts "" @@ -278,7 +278,7 @@ set parent [join [lrange [split $dir /] 0 end-1] /] if {$parent ne ""} { puts "
- + \[parent directory\]
@@ -337,7 +337,7 @@ foreach sl $sortlist { set tag "Currently sorting" if {$order != $index} { puts " - " + " set tag "Sort" } puts " $tag by $descr" diff --git a/var/mongoose/html/favicon.ico b/var/mongoose/html/favicon.ico new file mode 120000 index 0000000..faea57c --- /dev/null +++ b/var/mongoose/html/favicon.ico @@ -0,0 +1 @@ +img/fav/favicon.ico \ No newline at end of file diff --git a/var/mongoose/html/img/fav/114.png b/var/mongoose/html/img/fav/114.png new file mode 100644 index 0000000..a4cb165 Binary files /dev/null and b/var/mongoose/html/img/fav/114.png differ diff --git a/var/mongoose/html/img/fav/144.png b/var/mongoose/html/img/fav/144.png new file mode 100644 index 0000000..149f933 Binary files /dev/null and b/var/mongoose/html/img/fav/144.png differ diff --git a/var/mongoose/html/img/fav/16.png b/var/mongoose/html/img/fav/16.png new file mode 100644 index 0000000..bb440a4 Binary files /dev/null and b/var/mongoose/html/img/fav/16.png differ diff --git a/var/mongoose/html/img/fav/32-x.png b/var/mongoose/html/img/fav/32-x.png new file mode 100644 index 0000000..d9da5be Binary files /dev/null and b/var/mongoose/html/img/fav/32-x.png differ diff --git a/var/mongoose/html/img/fav/32.png b/var/mongoose/html/img/fav/32.png new file mode 100644 index 0000000..6e0a221 Binary files /dev/null and b/var/mongoose/html/img/fav/32.png differ diff --git a/var/mongoose/html/img/fav/57.png b/var/mongoose/html/img/fav/57.png new file mode 100644 index 0000000..85e51b3 Binary files /dev/null and b/var/mongoose/html/img/fav/57.png differ diff --git a/var/mongoose/html/img/fav/64.png b/var/mongoose/html/img/fav/64.png new file mode 100644 index 0000000..4cfe4eb Binary files /dev/null and b/var/mongoose/html/img/fav/64.png differ diff --git a/var/mongoose/html/img/fav/72.png b/var/mongoose/html/img/fav/72.png new file mode 100644 index 0000000..66feb56 Binary files /dev/null and b/var/mongoose/html/img/fav/72.png differ diff --git a/var/mongoose/html/img/fav/favicon.ico b/var/mongoose/html/img/fav/favicon.ico new file mode 100644 index 0000000..a04f37c Binary files /dev/null and b/var/mongoose/html/img/fav/favicon.ico differ diff --git a/var/mongoose/html/img/fav/notes.txt b/var/mongoose/html/img/fav/notes.txt new file mode 100644 index 0000000..396ac9a --- /dev/null +++ b/var/mongoose/html/img/fav/notes.txt @@ -0,0 +1,6 @@ + + + + + + diff --git a/var/mongoose/html/lib/header.jim b/var/mongoose/html/lib/header.jim index bb32109..2b549dd 100755 --- a/var/mongoose/html/lib/header.jim +++ b/var/mongoose/html/lib/header.jim @@ -11,7 +11,13 @@ source /mod/webif/include/model.jim puts { - + + + + + + diff --git a/var/mongoose/html/pkg/index.shtml b/var/mongoose/html/pkg/index.shtml index 037ad72..650d0c8 100644 --- a/var/mongoose/html/pkg/index.shtml +++ b/var/mongoose/html/pkg/index.shtml @@ -42,15 +42,15 @@