Merge branch 'master' into df-commandcheck-patch

exists -proc -> exists -command
Test was failing for `sqlite3.open`, `xconv`.
2020-12-31 00:01:31 +00:00 · 2020-12-14 14:36:20 +00:00 · 2020-12-14 14:33:53 +00:00 · 2020-12-14 14:32:51 +00:00 · 2020-12-14 14:30:02 +00:00 · 2020-12-14 14:27:41 +00:00
12 changed files with 23 additions and 23 deletions
--- a/webif/lib/browse.class
+++ b/webif/lib/browse.class
@@ -1,7 +1,7 @@

 require system.class plugin

-if {![exists -proc class]} { package require oo }
+if {![exists -command class]} { package require oo }
 class dir {}
 class browse {}

--- a/webif/lib/clipboard.class
+++ b/webif/lib/clipboard.class
@@ -1,5 +1,5 @@

-if {![exists -proc class]} { package require oo }
+if {![exists -command class]} { package require oo }

 class clipboard {
 	path	"/tmp/webif.cb"
--- a/webif/lib/epg.class
+++ b/webif/lib/epg.class
@@ -1,7 +1,7 @@
 source /mod/webif/lib/setup

-if {![exists -proc class]} { package require oo }
-if {![exists -proc sqlite3.open]} { package require sqlite3 }
+if {![exists -command class]} { package require oo }
+if {![exists -command sqlite3.open]} { package require sqlite3 }

 require settings.class progressbar rsv.class mwildcard svc.class

--- a/webif/lib/pkg.class
+++ b/webif/lib/pkg.class
@@ -1,5 +1,5 @@

-if {![exists -proc class]} { package require oo }
+if {![exists -command class]} { package require oo }

 class pkg {
 	name		""
--- a/webif/lib/queue.class
+++ b/webif/lib/queue.class
@@ -1,6 +1,6 @@

-if {![exists -proc class]} { package require oo }
-if {![exists -proc sqlite3.open]} { package require sqlite3 }
+if {![exists -command class]} { package require oo }
+if {![exists -command sqlite3.open]} { package require sqlite3 }

 class queue {
 	id		-1
--- a/webif/lib/rsv.class
+++ b/webif/lib/rsv.class
@@ -1,8 +1,8 @@
 source /mod/webif/lib/setup

-if {![exists -proc class]} { package require oo }
-if {![exists -proc sqlite3.open]} { package require sqlite3 }
-if {![exists -proc binary]} { package require binary }
+if {![exists -command class]} { package require oo }
+if {![exists -command sqlite3.open]} { package require sqlite3 }
+if {![exists -command binary]} { package require binary }
 require settings.class system.class plugin svc.class

 set binaryfields aulEventToRecordInfo
--- a/webif/lib/settings.class
+++ b/webif/lib/settings.class
@@ -1,6 +1,6 @@

-if {![exists -proc class]} { package require oo }
-if {![exists -proc sqlite3.open]} { package require sqlite3 }
+if {![exists -command class]} { package require oo }
+if {![exists -command sqlite3.open]} { package require sqlite3 }

 if {![file exists /mod/etc/webif.db]} {
 	set ::settingsdb [sqlite3.open /mod/etc/webif.db]
--- a/webif/lib/svc.class
+++ b/webif/lib/svc.class
@@ -1,7 +1,7 @@
 source /mod/webif/lib/setup

-if {![exists -proc class]} { package require oo }
-if {![exists -proc sqlite3.open]} { package require sqlite3 }
+if {![exists -command class]} { package require oo }
+if {![exists -command sqlite3.open]} { package require sqlite3 }
 require system.class

 class svc {
--- a/webif/lib/system.class
+++ b/webif/lib/system.class
@@ -3,9 +3,9 @@ source /mod/webif/lib/setup

 package require xconv

-if {![exists -proc class]} { package require oo }
-if {![exists -proc sqlite3.open]} { package require sqlite3 }
-if {![exists -proc binary]} { package require binary }
+if {![exists -command class]} { package require oo }
+if {![exists -command sqlite3.open]} { package require sqlite3 }
+if {![exists -command binary]} { package require binary }

 class system {}

--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -1,7 +1,7 @@

-if {![exists -proc class]} { package require oo }
-if {![exists -proc pack]} { package require pack }
-if {![exists -proc xconv]} { package require xconv }
+if {![exists -command class]} { package require oo }
+if {![exists -command pack]} { package require pack }
+if {![exists -command xconv]} { package require xconv }
 source /mod/webif/lib/setup
 require system.class tvdb.class classdump

--- a/webif/lib/tvdb.class
+++ b/webif/lib/tvdb.class
@@ -1,8 +1,8 @@
 source /mod/webif/lib/setup

 package require cgi
-if {![exists -proc class]} { package require oo }
-if {![exists -proc sqlite3.open]} { package require sqlite3 }
+if {![exists -command class]} { package require oo }
+if {![exists -command sqlite3.open]} { package require sqlite3 }
 require system.class xml.class

 set ::tvdb::apikey 1764335F804A5A91
--- a/webif/lib/xml.class
+++ b/webif/lib/xml.class
@@ -2,7 +2,7 @@
 # From https://wiki.tcl-lang.org/page/Parsing+XML
 # Keith Vetter 2004-03-01

-if {![exists -proc class]} { package require oo }
+if {![exists -command class]} { package require oo }

 class xml {
 	xml	""
Author	SHA1	Message	Date
df	11e010ed3b	Merge branch 'master' into df-commandcheck-patch	2020-12-31 00:01:31 +00:00
df	5f29ab2f4d	exists -proc -> exists -command Test was failing for `sqlite3.open`, `xconv`.	2020-12-14 14:36:20 +00:00
df	954ddf6d8b	exists -proc -> exists -command	2020-12-14 14:33:53 +00:00
df	1d008a1bce	exists -proc -> exists -command Test was failing for `sqlite3.open`.	2020-12-14 14:32:51 +00:00
df	9779b82bd1	exists -proc -> exists -command Test was failing for `sqlite3.open`.	2020-12-14 14:30:02 +00:00
df	0f678564b8	exists -proc -> exists -command Test was failing for `sqlite3.open`.	2020-12-14 14:27:41 +00:00
df	6ac4216d44	exists -proc -> exists -command Test was failing for `sqlite3.open`.	2020-12-14 14:22:56 +00:00
df	1c5698388c	exists -proc -> exists -command Test was failing for `sqlite3.open`.	2020-12-14 14:15:47 +00:00
df	6fc0acf22f	exists -proc -> exists -command Test was failing for `sqlite3.open`	2020-12-14 14:14:03 +00:00
df	397d383051	exists -proc -> exists -command `sqlite3.open` is currently a command, so the test for it as a proc fails, presumably not what was intended.	2020-12-14 14:12:32 +00:00
df	23483c8fa5	exists -proc -> exists -command	2020-12-14 14:09:32 +00:00
df	b59bead2a2	exists -proc -> exists -command	2020-12-14 14:08:28 +00:00
df	b780b3dda8	exists -proc -> exists -command `exists -command` subsumes `exists -proc` This test is generally checking whether the command exists, rather than some proc that is overriding it. Currently `class` is a proc but this may not always be so.	2020-12-14 14:06:48 +00:00