Commit 5100014d9dfba9bce7155e9c098ed21cf5235878
2018-07-10T12:44:14
debian
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80
diff --git a/unix/debian.lisp b/unix/debian.lisp
index 0d77726..c2bd707 100644
--- a/unix/debian.lisp
+++ b/unix/debian.lisp
@@ -22,7 +22,8 @@
(define-resource-class debian-pkg (pkg)
()
- ((probe-debian-pkg :properties (:versions))))
+ ((probe-debian-pkg :properties (:arch :ensure :release :tags
+ :versions))))
(define-syntax apt<8>-list (name release version arch tags)
#~|([^/\s]+)(?:/([^\s]*))?\s+([^\s]+)\s+([^\s]+)(?:\s+\[([^\]]+)\])?|
@@ -34,9 +35,8 @@
(ensure :absent))
(multiple-value-bind #1=(release version arch tags)
(with-apt<8>-list (name . #1#)
- (run "apt list | grep " id)
- (declare (type string name))
- (when (string= id name)
+ (run "apt list " (sh-quote id))
+ (when (and name (string= id (the string name)))
(when (find "installed" (the list tags))
(setf ensure :installed))
(return (values* #1#))))
@@ -47,23 +47,40 @@
(let ((packages))
(with-apt<8>-list (name release version arch tags)
(run "apt list | grep installed")
- (let ((pkg (resource 'debian-pkg name)))
+ (let ((pkg (resource 'debian-pkg name))
+ (ensure (if (find "installed" (the list tags))
+ :installed
+ :absent)))
(add-probed-properties pkg (properties* name release version
- arch tags))
+ arch tags ensure))
(push pkg packages)))
(list :packages (nreverse packages)))))
-#+nil
-(clear-resources)
-
-#+nil
-(describe-probed (resource 'openbsd-pkg "emacs"))
+(defmethod op-host-packages ((host host) (os os-linux-debian) &key packages)
+ (with-host host
+ (let ((install-packages
+ (with-output-to-string (out)
+ (dolist (id packages)
+ (let ((pkg (resource 'debian-pkg id :ensure :installed)))
+ (unless (eq :installed (get-probed pkg :ensure))
+ (write-str out " " (sh-quote id))))))))
+ (unless (string= "" install-packages)
+ (run "apt-get update")
+ (run "apt-get install" install-packages)))))
-#+nil
-(probe-installed-packages)
+(defmethod probe-host-locale ((host host) (os os-linux-debian))
+ (with-host host
+ (let ((lang (with-sh-var (var value) (run "cat /etc/default/locale")
+ (when (and var value (string= "LANG" (the string var)))
+ (return value)))))
+ (list :locale lang))))
-#+nil
-(map nil #'describe-probed (probe-installed-packages))
+(defmethod op-host-locale ((host host) (os os-linux-debian) &key locale)
+ (let ((sh-locale (sh-quote locale)))
+ (run "echo LANG=" sh-locale " > /etc/default/locale")
+ (run "export LANG=" sh-locale)))
-#+nil
-(run "pkg_info -q | grep emacs-")
+(defmethod op-hostname ((host host) (os os-linux-debian) &key hostname)
+ (let ((sh-hostname (sh-quote hostname)))
+ (run "echo " sh-hostname " > /etc/hostname")
+ (run "hostname " sh-hostname)))