[LW-10649] Add progress, update from the portable variant, incl. restarting cardano-launcher

Author: michalrus

nix/internal/linux-self-extracting-archive.sh

@@ -7,20 +7,25 @@ set -eu
 
 skip_bytes=$(( 1010101010 - 1000000000 ))
 
-echo "Verifying SHA-256 checksum..."
-our_checksum=$(tail -c+$((skip_bytes+1)) "$0" | sha256sum | cut -d' ' -f1)
-if [ "$our_checksum" != 0000000000000000000000000000000000000000000000000000000000000000 ] ; then
-  echo "Checksum verification failure. Please, download the installer again."
-  exit 1
-fi
-
 # We could be running as an auto-update from Daedalus ≤5.4.0 using `nix-chroot`,
 # then our behavior should be different:
 in_chroot=
+num_steps=5
 if [ "${1-}" = "--extract" ] && [ -e /nix/var/nix/profiles/profile-@CLUSTER@ ] ; then
   in_chroot=1
+  num_steps=6  # let’s have 6, so that we never reach 100% in UI, and the old update-runner also uses 6
 fi
 
+echo STATUS "Verifying SHA-256 checksum..."
+echo PROG 1/$num_steps
+our_checksum=$(tail -c+$((skip_bytes+1)) "$0" | sha256sum | cut -d' ' -f1)
+if [ "$our_checksum" != 0000000000000000000000000000000000000000000000000000000000000000 ] ; then
+  echo "Checksum verification failure. Please, download the installer again."
+  exit 1
+fi
+
+echo STATUS "Cleaning up the older version..."
+echo PROG 2/$num_steps
 target="$HOME"/.daedalus/@CLUSTER@
 if [ -e "$target" ] ; then
   echo "Found an older version of Daedalus "@CLUSTER@", removing it..."
@@ -41,7 +46,8 @@ else
   echo "Note: you don't have \`pv' installed, so we can't show progress"
 fi
 
-echo "Unpacking..."
+echo STATUS "Unpacking..."
+echo PROG 3/$num_steps
 tail -c+$((skip_bytes+1)) "$0" | $progress_cmd | tar -C "$target" -xJ
 
 # Move a faux `satisfyOldUpdateRunner` to $PWD so that the old `update-runner` doesn’t error out:
@@ -54,7 +60,8 @@ else
 fi
 chmod -w "$target"
 
-echo "Setting up a .desktop entry..."
+echo STATUS "Setting up a .desktop entry..."
+echo PROG 4/$num_steps
 mkdir -p "$HOME"/.local/share/applications
 chmod -R +w "$target"/share/applications
 sed -r "s+INSERT_PATH_HERE+$(echo "$target"/bin/*)+g" -i "$target"/share/applications/*.desktop
@@ -68,7 +75,18 @@ DAEDALUS_DIR="${XDG_DATA_HOME}/Daedalus"
 mkdir -p "$DAEDALUS_DIR"/@CLUSTER@/
 ln -sf "$target"/bin/daedalus "$DAEDALUS_DIR"/@CLUSTER@/namespaceHelper
 
+# If this is an auto-update, let's move the old lockfile out of the way, as we’ll restart cardano-launcher,
+# while the previous one is still running for a second (either in `satisfyOldUpdateRunner` or in the new
+# `daedalus-frontend`):
+if [ -e "$DAEDALUS_DIR"/@CLUSTER@/daedalus_lockfile ] ; then
+  mv "$DAEDALUS_DIR"/@CLUSTER@/daedalus_lockfile \
+     "$DAEDALUS_DIR"/@CLUSTER@/daedalus_lockfile.pre-auto-update || true
+fi
+
+echo STATUS "Done"
+echo PROG 5/$num_steps
 if [ -z "$in_chroot" ] ; then
+  echo
   echo "Installed successfully!"
   echo
   echo "Now, either:"

nix/internal/x86_64-linux.nix

@@ -184,14 +184,27 @@ in rec {
     ];
   });
 
-  relocatableElectron = (import (pkgs.runCommandNoCC "nix-bundle-exe-patched" {} ''
+  relocatableElectron = let
+    additionalLibs = ''
+      additionalLibs=(
+        ${pkgs.xorg.libX11}/lib/libX11-xcb.so.1
+        ${pkgs.xorg.libxcb}/lib/*.so.?
+        ${pkgs.systemd /* patched */}/lib/{libudev.so.1,libsystemd.so.0,libnss_*.so.2}
+        ${pkgs.nss}/lib/*.so
+        ${pkgs.libusb}/lib/*.so.0
+        ${pkgs.nssmdns}/lib/*.so.2
+        ${pkgs.numactl}/lib/libnuma.so.1
+        ${pkgs.pciutils}/lib/libpci.so.3
+        ${pkgs.libva.out}/lib/*.so.2
+        ${pkgs.atk}/lib/libatk-bridge-2.0.so
+        $(find ${pkgs.glibc}/lib -type l)
+      )
+    '';
+  in (import (pkgs.runCommandNoCC "nix-bundle-exe-patched" {} ''
     cp -r ${inputs.nix-bundle-exe} $out
     chmod -R +w $out
-    for additionalLib in \
-      ${pkgs.xorg.libX11}/lib/libX11-xcb.so.1 \
-      ${pkgs.systemd /* patched */}/lib/{libudev.so.1,libsystemd.so.0,libnss_*.so.2} \
-      ${pkgs.nss}/lib/*.so \
-    ; do
+    ${additionalLibs}
+    for additionalLib in "''${additionalLibs[@]}" ; do
       sed -r '/bundleExe "\$binary"/a\  bundleLib "'"$additionalLib"'" "lib"' -i $out/bundle-linux.sh
     done
   '') {
@@ -200,7 +213,7 @@ in rec {
     #bin_dir = "electron-bin";
     inherit pkgs;
   } electronBin).overrideAttrs (drv: {
-    buildCommand = (builtins.replaceStrings ["find '"] ["find -L '"] drv.buildCommand) + ''
+    buildCommand = additionalLibs + (builtins.replaceStrings ["find '"] ["find -L '"] drv.buildCommand) + ''
       chmod -R +w $out
 
       mkdir -p $out/lib
@@ -212,6 +225,8 @@ in rec {
       rm $out/lib/electron/lib/ld-linux-x86-64.so.2
       ( cd $out/lib/electron && rm libffmpeg.so && ln -s lib/libffmpeg.so libffmpeg.so ; )
 
+      ( cd $out/lib/electron/lib && ln -s libatk-bridge-2.0.so libatk-bridge.so ; )
+
       patchelf --set-rpath '$ORIGIN/lib:$ORIGIN' $out/lib/electron/electron
 
       cp ${pkgs.writeScript "electron" ''
@@ -291,8 +306,8 @@ in rec {
         mkdir -p "''${DAEDALUS_DIR}/${cluster}"/Secrets
         cd "''${DAEDALUS_DIR}/${cluster}/"
 
-        if [ -e "''${DAEDALUS_DIR}/${cluster}"/daedalus_lockfile.old-nix-chroot ] ; then
-          rm "''${DAEDALUS_DIR}/${cluster}"/daedalus_lockfile.old-nix-chroot || true
+        if [ -e "''${DAEDALUS_DIR}/${cluster}"/daedalus_lockfile.pre-auto-update ] ; then
+          rm "''${DAEDALUS_DIR}/${cluster}"/daedalus_lockfile.pre-auto-update || true
         fi
 
         exec cardano-launcher --config "$ENTRYPOINT_DIR/config/launcher-config.yaml"
@@ -301,10 +316,25 @@ in rec {
       cp ${pkgs.writeText "daedalus-frontend" ''
         #!/bin/sh
         set -xe
+
+        # `daedalus-frontend` is what `cardano-launcher` restarts during auto-update; let’s detect
+        # this case here, and restart the `cardano-launcher` itself, in case we need it to
+        # be updated as well:
+        if [ -e "''${DAEDALUS_DIR}/${cluster}"/daedalus_lockfile.pre-auto-update ] ; then
+          nohup setsid ~/.daedalus/${cluster}/bin/daedalus </dev/null >/dev/null 2>/dev/null &
+          exit 0
+        fi
+
         exec electron --disable-setuid-sandbox --no-sandbox "$ENTRYPOINT_DIR"/libexec/daedalus-js "$@"
       ''} $out/libexec/daedalus-frontend
 
-      chmod +x $out/bin/* $out/libexec/daedalus-frontend
+      cp ${pkgs.writeText "update-runner" ''
+        #!/bin/sh
+        set -xe
+        exec "$1"
+      ''} $out/libexec/update-runner
+
+      chmod +x $out/bin/* $out/libexec/{daedalus-frontend,update-runner}
 
       mkdir -p $out/share/applications
       cp ${common.launcherConfigs.${cluster}.installerConfig.iconPath.large} $out/share/icon_large.png
@@ -422,10 +452,6 @@ in rec {
               echo -n "$HOME/.daedalus${pkgs.writeScript "escape-and-scrap-chroot" ''
                 #!/bin/sh
                 set -eu
-                XDG_DATA_HOME="''${XDG_DATA_HOME:-''${HOME}/.local/share}"
-                DAEDALUS_DIR="''${XDG_DATA_HOME}/Daedalus"
-                mv "$DAEDALUS_DIR"/${cluster}/daedalus_lockfile \
-                   "$DAEDALUS_DIR"/${cluster}/daedalus_lockfile.old-nix-chroot || true
                 nohup setsid ~/.daedalus/${cluster}/bin/daedalus </dev/null >/dev/null 2>/dev/null &
                 sleep 5
                 ${removeOldNixChroot.${cluster}}