host info updates

[distro-setup] / distro-begin

diff --git a/distro-begin b/distro-begin
index 4104e0015ce4ee1f44d1971696b1c1530be70087..59e50d595efa3b4935707ab86e3d827ab7c2f1d7 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -1,17 +1,21 @@
 #!/bin/bash
-# Copyright (C) 2016 Ian Kelling
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Setup Ian's computers
+# Copyright (C) 2024  Ian Kelling
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #### for setting up a new machine
 # usage: $0 [-r] [HOSTNAME]
@@ -21,6 +25,8 @@
 # /a/bin/ds/filesystem/etc/prometheus/rules/iank.yml
 #
 # Update hostnames in /b/ds/check-remote-mailqs
+# Update hostnames in /b/ds/machine_specific/*.hosts /p/c/machine_specific/*.hosts
+# Update hostnames in this file
 
 ### end new machine setup
 
@@ -51,7 +57,7 @@
 
 
 ### make ssh interactive shell run better. for when running line interactively line by line
-sudo bash -c '/a/exe/ssh-emacs-setup'
+sudo bash -c '/a/exe/ssh-emacs-setup' || exit $?
 
 ##### setup error handling
 interactive=true  # set this to false to force set -x
@@ -107,7 +113,7 @@ source $script_dir/pkgs
 set +x
 source /a/bin/distro-functions/src/identify-distros
 $interactive || set -x
-for f in kd x2 x3 x8 frodo tp li bk je demohost kw sy bo; do
+for f in kd x2 x3 x8 frodo tp li bk je demohost kw sy bo so; do
   eval "$f() { [[ $HOSTNAME == $f ]]; }"
 done
 codename=$(debian-codename)
@@ -304,8 +310,8 @@ set +x
 err-allow
 source /etc/profile.d/environment.sh
 export LC_USEBASHRC=t
-# shellcheck source=./.bashrc
-source ~/.bashrc
+# shellcheck source=./brc
+source ~/brc
 err-catch
 $interactive || set -x
 
@@ -378,7 +384,7 @@ if [[ -e $f ]]; then
       fi
     fi
   done
-  if $apparmor_reload && systemctl is-enabled apparmor; then
+  if $apparmor_reload && systemctl is-active apparmor; then
     m ser reload apparmor
   fi
 fi
@@ -481,6 +487,7 @@ if isarch; then
 fi
 
 #### update all packages
+# shellcheck disable=SC2119 # obvious
 pup
 
 
@@ -708,8 +715,7 @@ if has_monitor; then
 
 
   ###### install X
-  # no recommends due to this bug: https://trisquel.info/en/issues/26525
-  pi --no-install-recommends i3
+  pi i3
 
   ##### install xinput
   case $(distro-name) in