diff --git a/library/UNIXUTILS b/library/UNIXUTILS index 28ffedcfe..16b1efaef 100644 --- a/library/UNIXUTILS +++ b/library/UNIXUTILS @@ -1,12 +1,13 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "22-Oct-2025 13:05:51" {WMEDLEY}UNIXUTILS.;33 17919 +(FILECREATED " 2-Nov-2025 12:18:12" {DSK}frank>il>medley>library>UNIXUTILS.;2 18685 - :EDIT-BY rmk + :EDIT-BY "FGH" - :CHANGES-TO (FNS SLASHIT) + :CHANGES-TO (VARS UNIXUTILSCOMS) + (FUNCTIONS ShellWget) - :PREVIOUS-DATE "27-Sep-2025 16:25:07" {WMEDLEY}UNIXUTILS.;32) + :PREVIOUS-DATE "22-Oct-2025 13:05:51" {DSK}frank>il>medley>library>UNIXUTILS.;1) (PRETTYCOMPRINT UNIXUTILSCOMS) @@ -18,7 +19,7 @@ (GLOBALVARS ShellBrowser ShellOpener) (INITVARS (ShellBrowser) (ShellOpener)) - (FUNCTIONS ShellCommand ShellWhich) + (FUNCTIONS ShellCommand ShellWget ShellWhich) (ADDVARS (MEDLEY-INIT-VARS (ShellBrowser) (ShellOpener))) (FNS ShellBrowser ShellBrowse ShellOpener ShellOpen PROCESS-COMMAND SLASHIT UNIX-FILE-NAME) @@ -46,6 +47,20 @@ OUT)) NIL) +(CL:DEFUN ShellWget (URL OUTFILENAME) (* ; "Edited 1-Nov-2025 23:42 by FGH") + (LET* ((WGET (ShellWhich "wget")) + (OUTNAME (OUTFILEP OUTFILENAME)) + (UNIXNAME (LET [(UN (UNIX-FILE-NAME OUTNAME 'OUTPUT] + (if (STREQUAL (SUBSTRING UN (NCHARS UN)) + ".") + then (SUBSTRING UN 1 -2) + else UN))) + (CMD (CONCAT WGET " " URL " -O " UNIXNAME))) + (if (NULL WGET) + then (ERROR "ShellWget - wget not available")) + (ShellCommand CMD) + OUTNAME)) + (CL:DEFUN ShellWhich (Cmd) (* ; "Edited 18-Jan-2023 13:19 by FGH") [CL:WITH-OPEN-STREAM (S (OPENSTREAM '{NODIRCORE} 'BOTH)) (ShellCommand (CONCAT "command -v " Cmd) @@ -326,7 +341,8 @@ (PUTPROPS UNIXUTILS FILETYPE CL:COMPILE-FILE) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1110 1483 (ShellCommand 1110 . 1483)) (1485 1882 (ShellWhich 1485 . 1882)) (1972 17841 -(ShellBrowser 1982 . 3754) (ShellBrowse 3756 . 4441) (ShellOpener 4443 . 6131) (ShellOpen 6133 . 11612 -) (PROCESS-COMMAND 11614 . 12227) (SLASHIT 12229 . 14566) (UNIX-FILE-NAME 14568 . 17839))))) + (FILEMAP (NIL (1201 1574 (ShellCommand 1201 . 1574)) (1576 2249 (ShellWget 1576 . 2249)) (2251 2648 ( +ShellWhich 2251 . 2648)) (2738 18607 (ShellBrowser 2748 . 4520) (ShellBrowse 4522 . 5207) (ShellOpener + 5209 . 6897) (ShellOpen 6899 . 12378) (PROCESS-COMMAND 12380 . 12993) (SLASHIT 12995 . 15332) ( +UNIX-FILE-NAME 15334 . 18605))))) STOP diff --git a/library/UNIXUTILS.DFASL b/library/UNIXUTILS.DFASL index 8dd244439..2bf83f03e 100644 Binary files a/library/UNIXUTILS.DFASL and b/library/UNIXUTILS.DFASL differ