improve automatic updates

[distro-setup] / filesystem / usr / local / bin / myupgrade-iank

diff --git a/filesystem/usr/local/bin/myupgrade-iank b/filesystem/usr/local/bin/myupgrade-iank
index b4cd1a48bcc36065ae8615b63f8cc10fadbb0461..7c7a2bfed187828895a3ecf14ddb08cb5961efdf 100755 (executable)
--- a/filesystem/usr/local/bin/myupgrade-iank
+++ b/filesystem/usr/local/bin/myupgrade-iank
@@ -1,10 +1,28 @@
 #!/bin/bash
-# Copyright (C) 2019 Ian Kelling
-# SPDX-License-Identifier: AGPL-3.0-or-later
+# 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.
 
-if [ -z "$BASH_VERSION" ]; then echo "error: shell is not bash" >&2; exit 1; fi
+# 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.
+# 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.
+
+
+set -e; . /usr/local/lib/bash-bear; set +e
 
-source /usr/local/lib/bash-bear
 pre="${0##*/}:"
 m() { printf "$pre %s\n"  "$*"; "$@"; }
 e() { printf "$pre %s\n"  "$*"; }
@@ -17,6 +35,7 @@ fi
 
 hn=$(hostname -f)
 
+/a/bin/buildscripts/go
 /a/bin/buildscripts/rust
 
 has_x=false
@@ -28,12 +47,11 @@ for pkg in xorg wayland; do
 done
 
 if $has_x; then
-  /a/bin/buildscripts/tor-browser
   /a/bin/buildscripts/misc
+  /a/bin/buildscripts/tor-browser
 fi
 
 
-
 # source /a/bin/distro-setup/path-add-function
 # export GOPATH=$HOME/go
 # path-add $GOPATH/bin