@@ -84,8 +84,9 @@ The full list, including the OpenComputers config settings, is under
    there until its script reports). Check the address in the command is
    one the Minecraft server can reach (**Use a different address** changes
    it), then paste the command into that computer (each one, if you use
-   several). It asks which scripts to install, checks that the computer
-   can reach the server, and can start the scripts on every boot. If it can't reach it, see
+   several), after ticking the scripts that computer should run. It
+   installs them, checks that the computer can reach the server, starts
+   them on every boot and reboots. If it can't reach it, see
    [Scripts can't reach the server](#scripts-cant-reach-the-server).
 
 The page shows "waiting for data" until the scripts report. For settings,
 
@@ -1644,10 +1644,18 @@ nothing else. Separate from craft_monitor on purpose: an update must
 still work when the script it would fix has crashed.
 
 Connecting a computer: the Status dialog's "Connect a computer" builds
-one line, `wget ... gcm.lua && /tmp/gcm.lua install --server=<url>
---api-key=<key>` (OpenOS's shell chains with `&&`; checked in game), from
-`/api/admin/connect` (the API key and `PUBLIC_URL`; the page's own origin
-without it). The key is masked on screen but copied in full - the
+one line, `wget ... gcm.lua && /tmp/gcm.lua install <scripts>
+--server=<url> --api-key=<key>` (OpenOS's shell chains with `&&`; checked
+in game), from `/api/admin/connect` (the API key and `PUBLIC_URL`; the
+page's own origin without it). The scripts are the ones ticked above it
+(`CONNECT_SCRIPTS` in agents.js, which a JS test holds to
+oc/manifest.lua's components; the ticks kept in localStorage); naming them
+skips gcm's question for each. That gcm.lua comes from main, not a
+release, so installer changes reach new computers on merge. Install asks
+nothing else: it always enables the scripts and gcm_agent in rc and
+reboots 3 seconds later, except when the server check failed or a value
+was left blank (`write_config` returns whether the config is usable),
+because the reboot would clear the explanation off the screen. The key is masked on screen but copied in full - the
 clipboard API needs HTTPS or localhost, so it falls back to
 `execCommand('copy')` for a plain-HTTP LAN page. Before writing
 config.lua, `gcm install` POSTs `/api/agent/ping` with the key and says
 
@@ -173,21 +173,26 @@ wget -f https://raw.githubusercontent.com/Maselkov/gtnh-craft-monitor/main/oc/gc
 
 **Settings (⚙) → Status → Connect a computer** on the web page shows
 both as one command, joined with `&&`, with this server's address and API
-key filled in, ready to copy. Paste it into the computer with the middle
-mouse button or Insert.
+key filled in, ready to copy. Tick the scripts this computer should run
+first (Crafts, Power, Network; the page remembers your choice), and the
+command names them, so the computer doesn't ask. Paste it into the
+computer with the middle mouse button or Insert.
 The address is the page's own unless `PUBLIC_URL` is set; if the
 Minecraft server reaches the monitor some other way, press **Use a
 different address** there and type it in.
 
-`gcm install` asks which scripts to install, and warns when a chosen
+Without script names, `gcm install` asks which to install. It warns when a chosen
 script's block isn't connected: an Adapter touching an ME controller or
 interface for craft and network, or a GregTech machine for power. For
 network it also notes when there's no optional ME Interface Terminal. The
 script is installed anyway, so the Adapter can go in later. Then it checks that the
 computer reaches the server with the key, saying what's wrong if it
 doesn't, and writes both to `/home/config.lua`. Without `--server` and
-`--api-key` it asks for them. It can also enable the scripts so they start
-on every boot, and offers to reboot to start them.
+`--api-key` it asks for them. Then it enables the scripts so they start
+on every boot and reboots after 3 seconds to start them. If the server
+check failed or a value was left blank, it doesn't reboot, so you can
+read what went wrong: fix `/home/config.lua` (or paste the command
+again), then reboot.
 
 It also puts a GCM banner in `/etc/motd`, which OpenOS shows when the
 shell starts: the logo, the installed version, and each script with how it
 
@@ -8,8 +8,10 @@
 -- Add --ref=<tag or branch> to install or update from something other
 -- than the latest release, e.g. --ref=main to test unreleased changes.
 -- install --server=<url> --api-key=<key> skips asking for those two: the
--- web page's Status dialog shows the whole command to paste. They also
--- replace the ones in an existing config.lua.
+-- web page's Status dialog shows the whole command to paste, with the
+-- scripts picked there. They also replace the ones in an existing
+-- config.lua. install enables the scripts on boot and reboots to start
+-- them, unless the server check failed or a value was left blank.
 -- update --no-reboot skips the reboot question: gcm_agent.lua runs it
 -- that way for the web page's update button, and reboots itself.
 --
@@ -32,6 +34,9 @@ local REPO = "Maselkov/gtnh-craft-monitor"
 local STATE_PATH = "/etc/gcm.cfg"
 local CONNECT_TIMEOUT_SECONDS = 30
 local STALL_TIMEOUT_SECONDS = 30
+-- Long enough to see a warning about a missing Adapter go by; the boot
+-- banner and the web page's Status dialog show it afterwards too.
+local INSTALL_REBOOT_SECONDS = 3
 -- Length and checksum() of OpenOS's own /etc/motd
 -- (oc/tests/fixtures/openos_motd), which gcm may replace with its banner.
 local STOCK_MOTD_LENGTH = 1558
@@ -330,8 +335,8 @@ local function quoted_list(list)
 end
 
 -- services: each component's rc service, for gcm_agent to report on.
--- agent_set_up: gcm_agent has been enabled (or the user declined
--- starting anything on boot), so updates don't enable it again.
+-- agent_set_up: gcm_agent has been enabled, so updates don't enable it
+-- again (and a player's `rc gcm_agent disable` sticks).
 local function write_state(state)
   local file = assert(io.open(STATE_PATH, "w"))
   file:write("-- Written by gcm. Lists what `gcm update` updates.\n")
@@ -409,7 +414,8 @@ local function is_local_host(url)
 end
 
 -- Tries the URL and key on the server now, so a mistake shows here
--- rather than as scripts that never report. Says what went wrong.
+-- rather than as scripts that never report. Says what went wrong, and
+-- returns whether the server accepted them.
 local function check_server(url, key)
   print("Checking " .. url .. " ...")
   local handle, err, code = open_request(url .. "/api/agent/ping", "{}",
@@ -443,6 +449,8 @@ end
 -- answers) filled in. After that, only the options given are written and
 -- the rest of the file is kept, so pasting the page's command again moves
 -- a computer to a new address or key; without them it's left alone.
+-- Returns whether the scripts can start with it: the server accepted the
+-- address and key, or an existing file was kept as it is.
 local function write_config(ref, cfg, opts)
   local url = opts.server and opts.server:gsub("/+$", "")
   local key = opts["api-key"]
@@ -451,7 +459,7 @@ local function write_config(ref, cfg, opts)
   if existing then
     if not (url or key) then
       print("Keeping existing " .. cfg.dst)
-      return
+      return true
     end
     local file = assert(io.open(cfg.dst, "r"))
     text = file:read("*a")
@@ -481,8 +489,9 @@ local function write_config(ref, cfg, opts)
     key = key or prompt("API key (on the web page: Settings > Status > Connect a computer)")
     checkUrl, checkKey = url, key
   end
+  local accepted = false
   if type(checkUrl) == "string" and checkUrl ~= "" and type(checkKey) == "string" and checkKey ~= "" then
-    check_server(checkUrl, checkKey)
+    accepted = check_server(checkUrl, checkKey)
   end
   for _, setting in ipairs({ { "SERVER_URL", url }, { "API_KEY", key } }) do
     local name, value = setting[1], setting[2]
@@ -504,6 +513,7 @@ local function write_config(ref, cfg, opts)
   if not existing and (url == "" or key == "") then
     print("Edit " .. cfg.dst .. " to set the missing values before starting the scripts.")
   end
+  return accepted
 end
 
 -- rc caches loaded services, and http.lua/json.lua stay in package.loaded,
@@ -592,18 +602,25 @@ local function cmd_install(args, opts)
   local state = { version = ref, components = all, services = services_for(manifest, all),
                   agent_set_up = previous and previous.agent_set_up }
   write_state(state)
-  write_config(ref, manifest.config, opts)
+  local ready = write_config(ref, manifest.config, opts)
 
   print()
-  if ask("Start the installed scripts automatically on every boot?", true) then
-    for _, name in ipairs(chosen) do
-      shell.execute("rc " .. find_component(manifest, name).service .. " enable")
-    end
-    if not state.agent_set_up then enable_agent() end
+  for _, name in ipairs(chosen) do
+    shell.execute("rc " .. find_component(manifest, name).service .. " enable")
   end
+  if not state.agent_set_up then enable_agent() end
   state.agent_set_up = true
   write_state(state)
-  offer_reboot()
+
+  -- Rebooting would clear the explanation of what to fix off the screen.
+  print()
+  if not ready then
+    print("Not rebooting: fix " .. manifest.config.dst .. " first, then reboot to start the scripts.")
+    return
+  end
+  print("Rebooting in " .. INSTALL_REBOOT_SECONDS .. " seconds to start the scripts.")
+  os.sleep(INSTALL_REBOOT_SECONDS)
+  computer.shutdown(true)
 end
 
 local function cmd_update(opts, no_reboot)
 
@@ -84,12 +84,12 @@ test("a failed update returns its message, for gcm_agent", function()
 end)
 
 -- A fresh computer for `gcm install`: no config.lua yet, the monitor's
--- ping answered by ping(req), and no to starting on boot and rebooting.
+-- ping answered by ping(req).
 local function install_env(ping)
   local env = github_env()
   os.remove(env:path("/home/config.lua"))
   env.server.routes["POST /api/agent/ping"] = ping
-  env.stdin = { "n", "n" }
+  env.stdin = {}
   return env
 end
 
@@ -111,11 +111,38 @@ test("install --server --api-key saves both once the server accepts the key", fu
   t.eq(env:printed("Leave a value blank"), false)
 end)
 
+test("install starts the scripts on boot and reboots without asking", function()
+  local env = install_env({ ok = true })
+  local started = env.now
+  t.eq(gcm(env, "install", "craft", "power", "--server=https://gtnh.example.com", "--api-key=k3y"), nil)
+  t.eq(count(env.shell_log, "rc craft_monitor enable"), 1)
+  t.eq(count(env.shell_log, "rc power_monitor enable"), 1)
+  t.eq(count(env.shell_log, "rc network_browser enable"), 0)
+  t.eq(count(env.shell_log, "rc gcm_agent enable"), 1)
+  t.eq(state(env).agent_set_up, true)
+  t.eq(env:printed("[Y/n]"), false)
+  t.truthy(env:printed("Rebooting in 3 seconds to start the scripts."))
+  t.eq(env.shutdown.reboot, true)
+  t.truthy(env.shutdown.at - started >= 3)
+
+  -- Adding a script later enables just that one; the agent stays as it is.
+  env.shutdown = nil
+  t.eq(gcm(env, "install", "network"), nil)
+  t.eq(count(env.shell_log, "rc network_browser enable"), 1)
+  t.eq(count(env.shell_log, "rc craft_monitor enable"), 1)
+  t.eq(count(env.shell_log, "rc gcm_agent enable"), 1)
+  t.truthy(env:printed("Keeping existing /home/config.lua"))
+  t.eq(env.shutdown.reboot, true)
+end)
+
 test("install says when the server refuses the key, and saves it anyway", function()
   local env = install_env({ status = 401, body = '{"error":"unauthorized"}' })
   t.eq(gcm(env, "install", "power", "--server=https://gtnh.example.com", "--api-key=wrong"), nil)
   t.truthy(env:printed("The server refused the API key."))
   t.eq(config(env).API_KEY, "wrong")
+  t.eq(count(env.shell_log, "rc power_monitor enable"), 1)
+  t.truthy(env:printed("Not rebooting: fix /home/config.lua first"))
+  t.eq(env.shutdown, nil)
 end)
 
 test("install points at OpenComputers' blacklist when a local address can't connect", function()
@@ -128,14 +155,33 @@ test("install points at OpenComputers' blacklist when a local address can't conn
   t.eq(gcm(public, "install", "power", "--server=https://gtnh.example.com", "--api-key=k3y"), nil)
   t.truthy(public:printed("The request comes from the Minecraft server"))
   t.eq(public:printed("OpenComputers blocks local addresses"), false)
+  t.eq(public.shutdown, nil)
 end)
 
 test("install asks for the address and key without the options", function()
   local env = install_env({ ok = true })
-  env.stdin = { "http://gtnh.example.com", "k3y", "n", "n" }
+  env.stdin = { "http://gtnh.example.com", "k3y" }
   t.eq(gcm(env, "install", "power"), nil)
   t.eq(config(env).SERVER_URL, "http://gtnh.example.com")
   t.truthy(env:printed("Leave a value blank"))
+  t.eq(env.shutdown.reboot, true)
+end)
+
+test("install doesn't reboot with a value left blank", function()
+  local env = install_env({ ok = true })
+  env.stdin = { "http://gtnh.example.com", "" }
+  t.eq(gcm(env, "install", "power"), nil)
+  t.eq(#env:requests_to("^/api/agent/ping$", "POST"), 0)
+  t.truthy(env:printed("Edit /home/config.lua to set the missing values"))
+  t.eq(env.shutdown, nil)
+end)
+
+test("install with no scripts named asks for each", function()
+  local env = install_env({ ok = true })
+  env.stdin = { "n", "y", "n" }
+  t.eq(gcm(env, "install", "--server=https://gtnh.example.com", "--api-key=k3y"), nil)
+  t.eq(state(env).components, { "power" })
+  t.eq(env.shutdown.reboot, true)
 end)
 
 test("install --server --api-key replace them in an existing config.lua, keeping the rest", function()
 
@@ -509,14 +509,16 @@ <h2>This base is private</h2>
         <div id="agentsList" class="agents-list"></div>
         <div class="status-heading connect-heading">Connect a computer</div>
         <div class="connect-computer">
-          <div class="modal-note">On an OpenComputers computer with an Internet Card, run this command: copy it and paste it into the computer with the middle mouse button or Insert.</div>
+          <div class="modal-note">On an OpenComputers computer with an Internet Card, run this command: pick the scripts it installs, copy it and paste it into the computer with the middle mouse button or Insert.</div>
+          <div id="connectScripts" class="agent-settings connect-scripts"></div>
+          <div id="connectNoScripts" class="agent-line agent-command failed" style="display:none;">Pick at least one script to install.</div>
           <div id="connectAddress" hidden>
             <label class="modal-label" for="connectServerUrl">This server's address, as the Minecraft server reaches it</label>
             <input id="connectServerUrl" class="modal-amount-input" spellcheck="false" autocomplete="off">
           </div>
           <div id="connectLocalNote" class="agent-line agent-command failed" style="display:none;">OpenComputers blocks local addresses like this one unless the Minecraft server's config allows them: see <a href="https://github.com/Maselkov/gtnh-craft-monitor#scripts-cant-reach-the-server" target="_blank" rel="noopener">Scripts can't reach the server</a>.</div>
           <div class="connect-command"><code id="connectCommand"></code><button class="range-btn" data-action="copy-connect">Copy</button></div>
-          <div class="agent-line">It downloads the installer, which asks which scripts to install, checks that the computer reaches this server with the API key, and saves both.</div>
+          <div class="agent-line">It downloads the installer, which installs the scripts, checks that the computer reaches this server with the API key and saves both, starts the scripts on every boot, and reboots to start them. If the server check fails it says why and doesn't reboot.</div>
           <div class="agent-buttons">
             <button class="range-btn" id="connectKeyBtn" data-action="toggle-connect-key">Show API key</button>
             <button class="range-btn" id="connectAddressBtn" data-action="edit-connect-address" title="If the Minecraft server reaches this server at another address than the one in the command">Use a different address</button>
 
@@ -785,6 +785,10 @@ body:not(.is-admin) .admin-only, body.is-admin .non-admin-only {
   border-color: var(--accent);
   color: var(--accent);
 }
+.range-btn:disabled {
+  opacity: 0.4;
+  cursor: not-allowed;
+}
 .chart-wrap {
   background: var(--card);
   border-radius: 12px;
@@ -1378,6 +1382,9 @@ body.private-locked #networkTab {
 .connect-heading {
   margin-top: 16px;
 }
+.connect-scripts {
+  margin: 10px 0 0;
+}
 .connect-command {
   display: flex;
   align-items: flex-start;