aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex <alex.corcoles@veecle.io>2024-06-03 21:33:01 +0200
committeralexpdp7 <alex@corcoles.net>2024-06-03 22:03:42 +0200
commitf3cd23837609c8fecfef1e21ddc31cd885a697e4 (patch)
tree7cb0031f807dc8e40fe25b40eda15fe07253b099
parentd251cdbe223dc124087d446106f02052086dbb7b (diff)
Support Ubuntu 24.04
-rw-r--r--emacs/emacs.bash14
-rw-r--r--scripts/p7s/bash.py6
2 files changed, 16 insertions, 4 deletions
diff --git a/emacs/emacs.bash b/emacs/emacs.bash
index 055e15ec..7be90a38 100644
--- 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 b5c503d0..22271dee 100644
--- 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("""