fixes to last commit

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index e5770d48647187929627419eecbeabd9928638e0..77cfa4ba89782d55ec1fa1b8497994c24531f93f 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -1,6 +1,22 @@
 #!/bin/bash
-# Copyright (C) 2019 Ian Kelling
-# SPDX-License-Identifier: AGPL-3.0-or-later
+
+# 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
 
 # shellcheck source=/a/bin/ds/.bashrc
 export LC_USEBASHRC=t; if [[ -s ~/.bashrc ]]; then . ~/.bashrc; fi
@@ -178,8 +194,11 @@ EOF
     if $doupdate; then
       tmpdir=$(mktemp -d)
       cd $tmpdir
+      # otherwise we get a warning message:
+      # W: Download is performed unsandboxed as root as file '/tmp/tmp.UwxbPFG3CZ/debian-archive-keyring_2021.1.1+deb11u1_all.deb' couldn't be accessed by user '_apt'. - pkgAcquire::Run (13: Permission denied)
+      chmod 775 .
       p download debian-archive-keyring
-      s dpkg -i debian-archive-keyring
+      s dpkg -i ./debian-archive-keyring*
       p update
       cd -
       rm -rf $tmpdir
@@ -1547,7 +1566,8 @@ m /a/bin/buildscripts/go
 # only needed for rg. cargo takes up 11 gigs, filled up the disk on je.
 m /a/bin/buildscripts/rust
 m /a/bin/buildscripts/misc
-m /a/bin/buildscripts/pithosfly
+
+#m /a/bin/buildscripts/pithosfly
 #m /a/bin/buildscripts/alacritty
 #m /a/bin/buildscripts/kitty