Support Ubuntu 24.04

diff --git a/emacs/emacs.bash b/emacs/emacs.bash
index 055e15ec1fd715ea42ac15daad555ecd78d5b578..7be90a38458eac335b793cc17fb0c51b902cd6ca 100644 (file)
--- a/emacs/emacs.bash
+++ b/emacs/emacs.bash
@@ -1,5 +1,13 @@
 # source this file from your bash startup script
 
-alias emacs="emacs --emacs-appimage-run-as emacsclient --create-frame -t"
-export ALTERNATE_EDITOR=""
-export EDITOR="emacs --emacs-appimage-run-as emacsclient -t"
+test -f /usr/bin/emacs && {
+    alias emacs="emacsclient --create-frame -t"
+    export ALTERNATE_EDITOR=""
+    export EDITOR="emacsclient -t"
+}
+
+test -f ~/.local/bin/emacs && {
+    alias emacs="emacs --emacs-appimage-run-as emacsclient --create-frame -t"
+    export ALTERNATE_EDITOR=""
+    export EDITOR="emacs --emacs-appimage-run-as emacsclient -t"
+}

diff --git a/scripts/p7s/bash.py b/scripts/p7s/bash.py
index b5c503d0a522901a27263bbdd3f3ccaf8eeac2e2..22271dee13b2f35e9d079215f73e71680dec9587 100644 (file)
--- a/scripts/p7s/bash.py
+++ b/scripts/p7s/bash.py
@@ -7,8 +7,12 @@ def is_ubuntu_2204():
     return platform.freedesktop_os_release().get("VERSION_CODENAME") == "jammy"
 
 
+def is_ubuntu_2404():
+    return platform.freedesktop_os_release().get("VERSION_CODENAME") == "noble"
+
+
 def setup_bash():
-    if is_ubuntu_2204():
+    if is_ubuntu_2204() or is_ubuntu_2404():
         # clone the handy ~/.bashrc.d from Fedora
         bash_aliases = pathlib.Path.home() / ".bash_aliases"
         bash_aliases.write_text(textwrap.dedent("""