smoketest: get ca658dc and d8d93a4 installed; fingerprint all of .bashrc
shellcheck / shellcheck (push) Failing after 15s
shellcheck / shellcheck (push) Failing after 15s
30's fix-up commit now also adds clang and cmake, without which voxtype no longer builds from source (later commits install them), and stops ca658dc's bitwarden.sh failing on its unset LINE under the set -u that install-kickstart-nvim.sh leaves on. The fingerprint recorded only the line numbers of .bashrc's coredesktop lines, so 0c0ddf5's showed a line moved without saying what was added. Record the whole file, sorted. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -65,7 +65,8 @@ for cmd in update refresh sibling version configure audit; do
|
||||
done
|
||||
|
||||
section "Shell"
|
||||
grep -n coredesktop ~/.bashrc
|
||||
# All of ~/.bashrc, sorted: an updated machine adds lines in another order
|
||||
sort ~/.bashrc
|
||||
|
||||
section "GNOME extensions"
|
||||
gsettings get org.gnome.shell enabled-extensions
|
||||
|
||||
@@ -20,9 +20,16 @@ scenario() {
|
||||
# herdr-bin provides herdr, and is what HEAD installs instead
|
||||
# - Plain gext install asks GNOME Shell, which shows a dialog no one clicks;
|
||||
# --filesystem doesn't ask, and is what HEAD does
|
||||
# - voxtype from source no longer links without clang and cmake, which later
|
||||
# commits (and HEAD) install
|
||||
# - install.sh sources install-kickstart-nvim.sh, whose set -u then stops
|
||||
# bitwarden.sh on its unset LINE; without set -u, that line did nothing
|
||||
upstream_commit "Smoketest: fixes to install this baseline in a VM" '
|
||||
sed -i "s/^\([[:space:]]*\)herdr$/\1herdr-bin/" packages.conf
|
||||
grep -qx "[[:space:]]*clang" packages.conf \
|
||||
|| sed -i "s/^\([[:space:]]*\)voxtype$/\1clang\n\1cmake\n\1voxtype/" packages.conf
|
||||
sed -i "s|gext install|gext --filesystem install|" gnome/gnome-extensions.sh
|
||||
sed -i "s/\"\$LINE\"/\"\${LINE:-}\"/g" bitwarden.sh
|
||||
git diff --quiet && exit 0'
|
||||
|
||||
# Older installers also run flatpak install as the user, which polkit allows
|
||||
|
||||
Reference in New Issue
Block a user