Say "CoreDesktop is installed." at the end of every install
shellcheck / shellcheck (push) Failing after 17s
shellcheck / shellcheck (push) Failing after 17s
When configure had nothing left to do, install.sh ended on the kernel check and the firewall's warnings just above it, so a successful run could be taken for a failure. Move the end of install.sh to system/finish-install.sh, which now says the install worked before the reboot advice and configure offer, and test it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+2
-26
@@ -292,29 +292,5 @@ fi
|
||||
echo "Running migrations..."
|
||||
run_migrations
|
||||
|
||||
CONFIGURE_HINT="configure connects to your Federated Core, sets up backups and signs you in to the AI agents."
|
||||
|
||||
# If the running kernel's modules are gone, a newer kernel was installed during
|
||||
# this run. configure waits for the reboot: until then, modules it needs, such
|
||||
# as Tailscale's tun and davfs2's fuse, can't be loaded.
|
||||
if [ ! -d "/usr/lib/modules/$(uname -r)" ]; then
|
||||
echo "A newer kernel has been installed. Reboot, then run: configure"
|
||||
echo "$CONFIGURE_HINT"
|
||||
exit 0
|
||||
fi
|
||||
echo "Kernel is up to date, no reboot needed. You may want to consider a reboot if other significant software was updated or installed."
|
||||
|
||||
# Offer configure only if something is still to do, as refresh runs this too.
|
||||
# This script is usually piped into bash, so ask on the terminal, not stdin.
|
||||
if ~/.local/bin/configure --list | grep -q '^to do'; then
|
||||
echo
|
||||
echo "$CONFIGURE_HINT"
|
||||
if { : < /dev/tty; } 2> /dev/null && read -rp "Run configure now? [Y/n] " answer < /dev/tty \
|
||||
&& [[ "$answer" != [nN]* ]]; then
|
||||
# Straight to the terminal, outside the log: sign-ins need a terminal, and
|
||||
# their codes and links don't belong in a log
|
||||
~/.local/bin/configure < /dev/tty > /dev/tty 2>&1 || true
|
||||
else
|
||||
echo "To do it later, run: configure"
|
||||
fi
|
||||
fi
|
||||
# Say the install worked, whether to reboot, and offer configure
|
||||
bash ~/.local/share/coredesktop/system/finish-install.sh
|
||||
|
||||
Reference in New Issue
Block a user