distro specific fixes

[distro-setup] / ssh-emacs-setup

diff --git a/ssh-emacs-setup b/ssh-emacs-setup
index 4fcbc92098bd5cbc34b87e0d7fbc640170fb79f8..9faf683822f6fb41714a90c4395a2b63547dace8 100755 (executable)
--- a/ssh-emacs-setup
+++ b/ssh-emacs-setup
@@ -1,5 +1,12 @@
 #!/bin/bash
 #!/bin/bash

-# Copyright (C) 2016 Ian Kelling
+# I, Ian Kelling, follow the GNU license recommendations at
+# https://www.gnu.org/licenses/license-recommendations.en.html. They
+# recommend that small programs, < 300 lines, be licensed under the
+# Apache License 2.0. This file contains or is part of one or more small
+# programs. If a small program grows beyond 300 lines, I plan to switch
+# its license to GPL.
+
+# Copyright 2024 Ian Kelling

 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -13,9 +20,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

+

 if [[ $EUID != 0 ]]; then
 if [[ $EUID != 0 ]]; then

-    sudo "$0"
-    exit
+  sudo "$0"
+  exit

 fi
 # shellcheck source=/a/bin/ds/.bashrc
 if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi
 fi
 # shellcheck source=/a/bin/ds/.bashrc
 if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi


@@ -24,16 +32,23 @@ if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
 
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
 

-readonly this_file; this_file="$(readlink -f -- "${BASH_SOURCE[0]}")"; cd ${this_file%/*}
+this_file="$(readlink -f -- "${BASH_SOURCE[0]}")"
+readonly this_file this_dir="${this_file%/*}"
+cd "$this_dir"

 # get rid of useless motd stuff
 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
 
 # get rid of useless motd stuff
 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
 else

-    systemctl reload sshd
+  systemctl enable --now $ssh_ser

 fi
 fi