clavarium 0.1.0-next.9 → 0.1.1

package/deploy/install.sh

@@ -263,15 +263,22 @@ if [ "$KEEP_RELEASE" = "yes" ]; then
     release="$(basename "$(readlink -f "$CODE/current")")"
     echo "   the release that runs is kept: $release"
 else
-if [ -n "$VERSION" ]; then
+if [ -n "$VERSION" ] && [ -L "$CODE/current" ] && [ "$(basename "$(readlink -f "$CODE/current")")" = "$VERSION" ]; then
+    # Run again with the version that runs already (a step after it failed, a
+    # DNS record made late): kept as it is, and the rest goes on.
+    release="$VERSION"
+    echo "   clavarium@$VERSION runs here already: kept"
+elif [ -n "$VERSION" ]; then
     echo "   clavarium@$VERSION from npm: fetched, checked, built, tried (a few minutes)"
     release="$(updater prepare --version "$VERSION")" || refuse "clavarium@$VERSION was not installed (above: why)"
 else
     echo "   the working tree $FROM_DIR (development): copied, built, tried"
     release="$(updater prepare --from-dir "$FROM_DIR")" || refuse "the working tree was not installed (above: why)"
 fi
-systemctl stop clavarium.service 2>/dev/null || true
-updater switch "$release"
+if [ "$(basename "$(readlink -f "$CODE/current" 2>/dev/null)")" != "$release" ]; then
+    systemctl stop clavarium.service 2>/dev/null || true
+    updater switch "$release"
+fi
 fi
 APP="$CODE/current/app"
 NODE="$CODE/current/node/bin/node"
@@ -701,7 +708,7 @@ elif [ -n "$RELAY" ]; then
     # It is a PUBLIC key: showing it is safe; it lets the relay know this machine.
     if command -v qrencode >/dev/null 2>&1 || apt-get install -y -qq qrencode >/dev/null 2>&1; then
         echo "The same key, to read with a phone or a tablet:"
-        qrencode -t ANSIUTF8 -m 2 -- "$TUNNEL_KEY" || true
+        qrencode -t ANSI -m 1 -l L -- "$TUNNEL_KEY" || true
     fi
     echo "It will print this, and it must be the same:    $RELAY_PRINT"
     echo "The name $DOMAIN must lead to the relay."

package/deploy/online.mjs

@@ -81,9 +81,9 @@ export function parseOnline(args) {
         }
     }
     if (o.relay && o.port) throw new Bad('say how it will be reached: --relay HOST or --port, not both');
-    /* Neither: through a relay that does not exist yet -- its key is shown first,
-       and its address asked once the operator has made it with that key. */
-    if (!o.relay && !o.port) o.askRelay = true;
+    /* Neither: the usual case -- the domain points to the relay, which is
+       reached by the domain itself (its address is not needed). */
+    if (!o.relay && !o.port) o.relay = o.domain;
     if (!DOMAIN.test(o.domain)) throw new Bad('--domain is a host name, lower case, like clav.example.com');
     o.admin ||= `admin@${o.domain}`;
     if (!EMAIL.test(o.admin)) throw new Bad('--admin is an e-mail address, lower case');
@@ -124,7 +124,7 @@ export async function ensureKeys(sys, P = PATHS) {
 }
 
 async function qr(sys, text) {
-    const r = await sys.run(['qrencode', '-t', 'ANSIUTF8', '-m', '2', '--', text]);
+    const r = await sys.run(['qrencode', '-t', 'ANSI', '-m', '1', '-l', 'L', '--', text]);
     if (r.code === 0 && r.out) sys.print(r.out.replace(/\n$/, ''));
 }
 

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "clavarium",
-  "version": "0.1.0-next.9",
+  "version": "0.1.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "clavarium",
-      "version": "0.1.0-next.9",
+      "version": "0.1.1",
       "license": "MIT",
       "dependencies": {
         "@xterm/addon-fit": "^0.11.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clavarium",
-  "version": "0.1.0-next.9",
+  "version": "0.1.1",
   "license": "MIT",
   "type": "module",
   "description": "A conversation is a VM with a terminal in it. Everything else is a folder.",