From: alex <alex@pdp7.net>
Date: Fri, 8 Mar 2024 18:33:08 +0000 (+0100)
Subject: Move to RPM emacs
X-Git-Tag: 20241020-emacs~253
X-Git-Url: https://xn--ix-yja.es/gitweb/?a=commitdiff_plain;h=04226cebe9b30123c9a3a9ee3ef4411778bc5f32;p=alex.git

Move to RPM emacs
---

diff --git a/scripts/p7s/__init__.py b/scripts/p7s/__init__.py
index e69de29..e1dfa06 100644
--- a/scripts/p7s/__init__.py
+++ b/scripts/p7s/__init__.py
@@ -0,0 +1,4 @@
+import pathlib
+
+
+BASHRC_D = pathlib.Path.home() / ".bashrc.d"
diff --git a/scripts/p7s/emacs.py b/scripts/p7s/emacs.py
index da44bdf..3f46f3e 100644
--- a/scripts/p7s/emacs.py
+++ b/scripts/p7s/emacs.py
@@ -1,31 +1,8 @@
 import pathlib
-import shutil
-import textwrap
-import urllib.request
-
-
-COSMO_BUILD_URL = "https://github.com/alexpdp7/superconfigure/releases/download/emacs_29.1/editor.zip"
+import subprocess
 
+import p7s
 
 def setup_emacs():
-    cache = pathlib.Path.home() / ".cache"
-    editor_zip = cache / "editor.zip"
-    urllib.request.urlretrieve(COSMO_BUILD_URL, editor_zip)
-
-    superconfigure_cache = cache / "superconfigure"
-    shutil.unpack_archive(editor_zip, superconfigure_cache)
-
-    for b in (superconfigure_cache / "bin").glob("*"):
-        b.chmod(0o755)
-
-    bin = pathlib.Path.home() / ".local" / "bin"
-    emacs = bin / "emacs"
-    emacs.write_text(textwrap.dedent(f"""
-        #!/bin/sh
-
-        {superconfigure_cache}/bin/emacsclient --create-frame -t "$@" || {{
-            {superconfigure_cache}/bin/emacs --daemon --user=""
-            {superconfigure_cache}/bin/emacsclient --create-frame -t "$@"
-        }}
-    """).lstrip())
-    emacs.chmod(0o755)
+    p7s.BASHRC_D.mkdir(parents=True, exist_ok=True)
+    subprocess.run(["ln", "-s", (pathlib.Path(__file__).parent.parent.parent / "emacs" / "emacs.bash").absolute(), p7s.BASHRC_D / "emacs.bash"], check=True)