X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;fp=distro-end;h=8da4a26c284136cfb9f686081dea7df670b4a995;hb=ef3bbffe6d2a08ebd735ba4f09c7bd0fbea585a0;hp=f81baa3d0acf4ac5fc9cc09293f04f2e0757a168;hpb=6d1ec26482f86b0f2d9560ce3d04ea8c63297c25;p=distro-setup diff --git a/distro-end b/distro-end index f81baa3..8da4a26 100755 --- a/distro-end +++ b/distro-end @@ -18,8 +18,8 @@ # SPDX-License-Identifier: GPL-3.0-or-later -# shellcheck source=/a/bin/ds/.bashrc -export LC_USEBASHRC=t; if [[ -s ~/.bashrc ]]; then . ~/.bashrc; fi +# shellcheck source=./brc +source ~/brc ### setup source /a/bin/bash-bear-trap/bash-bear @@ -191,16 +191,17 @@ EOF done if $doupdate; then tmpdir=$(mktemp -d) - cd $tmpdir - # cant apt get the keyring without doing an update, can't update - # without the keyring, this is a stupid chicken and egg problem - # that apt should have some feature to solve, but doesn't as far - # as I know. - f=debian-archive-keyring_2023.3+deb12u1_all.deb - wget http://ftp.debian.org/debian/pool/main/d/debian-archive-keyring/$f - sudo dpkg -i $f + ( + cd $tmpdir + # cant apt get the keyring without doing an update, can't update + # without the keyring, this is a stupid chicken and egg problem + # that apt should have some feature to solve, but doesn't as far + # as I know. + f=debian-archive-keyring_2023.3+deb12u1_all.deb + wget http://ftp.debian.org/debian/pool/main/d/debian-archive-keyring/$f + sudo dpkg -i $f + ) p update - cd - rm -rf $tmpdir fi