diff packages.py @ 288:3af02e24eaf9

minor
author drewp@bigasterisk.com
date Sun, 21 Apr 2024 17:01:13 -0700
parents 73ec5064da44
children 65e28d2e0cd8
line wrap: on
line diff
--- a/packages.py	Sun Apr 21 14:03:04 2024 -0700
+++ b/packages.py	Sun Apr 21 17:01:13 2024 -0700
@@ -14,8 +14,8 @@
     local = f"{home}/.local/kitty"
     dl = f'/tmp/kitty-{vers}-x86_64.txz'
     files.download(src=f"https://github.com/kovidgoyal/kitty/releases/download/v{vers}/kitty-{vers}-x86_64.txz", dest=dl)
-    files.directory(local)
-    server.shell([
+    files.directory(path=local)
+    server.shell(commands=[
         f"mkdir -p {local}",  # https://github.com/Fizzadar/pyinfra/issues/777
         f"aunpack --extract-to={local} {dl}",
     ])
@@ -25,7 +25,7 @@
 def nodejs():
     apt.packages(packages=['libnode72'], present=False, force=True)
     apt.packages(packages=['nodejs'], latest=True)
-    server.shell([
+    server.shell(commands=[
         "rm -f /usr/local/bin/pnp{m,x}",
         "corepack enable",
         # https://github.com/pnpm/pnpm/releases
@@ -37,24 +37,17 @@
 def podman():
     # frigate build wants to mount a single file from the host, which needs podman 4.5.1
     # https://github.com/containers/podman/issues/12123#issuecomment-1620439593
-
-
-    server.shell('apt --fix-broken install')
+    server.shell(commands='apt --fix-broken install')
     apt.deb(src="http://ftp.osuosl.org/pub/ubuntu/pool/main/g/gpgme1.0/libgpgme11t64_1.18.0-4.1ubuntu4_amd64.deb")
-    server.shell('apt --fix-broken install')
+    server.shell(commands='apt --fix-broken install')
     apt.deb(src="http://ftp.osuosl.org/pub/ubuntu/pool/universe/c/conmon/conmon_2.1.10+ds1-1build2_amd64.deb")
     apt.deb(src="http://ftp.osuosl.org/pub/ubuntu/pool/universe/libp/libpod/podman_4.9.3+ds1-1build2_amd64.deb")
-
-
-    # https://ftp.osuosl.org/pub/ubuntu/pool/main/g/gpgme1.0/libgpgme11_1.18.0-3ubuntu2_amd64.deb
-    # apt.deb(src="https://ftp.osuosl.org/pub/ubuntu/pool/main/g/gpgme1.0/libgpgme11t64_1.18.0-4.1ubuntu4_amd64.deb")
-    # apt.deb(src="https://ftp.osuosl.org/pub/ubuntu/pool/universe/libp/libpod/podman_4.9.3+ds1-1build2_amd64.deb")
     apt.packages(packages=['libsubid4', 'buildah', 'podman-docker'], latest=True)
 
 
 def pdm():
     # https://github.com/pdm-project/pdm/blob/main/CHANGELOG.md
-    server.shell(["pip install --break-system-packages 'pdm==2.12.4'"])
+    server.shell(commands=["pip install --break-system-packages 'pdm==2.12.4'"])
 
 
 def proper_locate():