lots of fixes, improvements, t12 stuff

[distro-setup] / ssh-emacs-setup

diff --git a/ssh-emacs-setup b/ssh-emacs-setup
index 309ab0a5ac3ea28222c812d843cf182020752f70..9faf683822f6fb41714a90c4395a2b63547dace8 100755 (executable)
--- a/ssh-emacs-setup
+++ b/ssh-emacs-setup
@@ -22,8 +22,8 @@
 
 
 if [[ $EUID != 0 ]]; then
-    sudo "$0"
-    exit
+  sudo "$0"
+  exit
 fi
 # shellcheck source=/a/bin/ds/.bashrc
 if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi
@@ -39,11 +39,16 @@ cd "$this_dir"
 sed -i --follow-symlinks 's/^\s*PrintLastLog .*/PrintLastLog no/' /etc/ssh/sshd_config
 rm -f /etc/update-motd.d/10-help-text /etc/update-motd.d/00-header
 
+ssh_ser=ssh
+if command -v apt-get &>/dev/null; then
+  # fyi: debconf-set-selections doesn't like mixing tabs and spaces
+  echo "debconf debconf/frontend select Readline" | debconf-set-selections
+else
+  ssh_ser=sshd
+fi
 
-if isdeb; then
-    # fyi: debconf-set-selections doesn't like mixing tabs and spaces
-    echo "debconf debconf/frontend select Readline" | debconf-set-selections
-    service ssh reload
+if systemctl is-active $ssh_ser; then
+  systemctl reload $ssh_ser
 else
-    systemctl reload sshd
+  systemctl enable --now $ssh_ser
 fi