appimage: split checks between appimageSignature and appimageType

1 files changed, 18 insertions, 9 deletions

diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index f8e5206bbb5a2..7459a028f076e 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -8,13 +8,23 @@ rec {
     nativeBuildInputs = [ radare2 libarchive jq squashfsTools ];
     buildCommand = ''
       # https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63
-      appimageType=$(r2 $src -nn -Nqc "p8 3 @ 8")
+      eval $(r2 $src -nn -Nqc "p8j 3 @ 8" |
+        jq -r '{appimageSignature: (.[:-1]|implode), appimageType: .[-1]}|
+          @sh "appimageSignature=\(.appimageSignature) appimageType=\(.appimageType)"')
+
+      # check AppImage signature
+      if [[ $appimageSignature != "AI" ]]; then
+        echo "Not an appimage."
+        exit
+      fi
+
       case "$appimageType" in
-        414901)
+        1)
           mkdir $out
-          bsdtar -x -C $out -f $src;;
+          bsdtar -x -C $out -f $src
+          ;;
 
-        414902)
+        2)
           install $src ./appimage
 
           # multiarch offset one-liner using same method as AppImage
@@ -22,12 +32,11 @@ rec {
           offset=$(r2 ./appimage -nn -Nqc "pfj.elf_header @ 0" |\
             jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)')
 
-          unsquashfs -o $offset ./appimage
-
-          cp -rv squashfs-root $out;;
+          unsquashfs -q -d $out -o $offset ./appimage
+          ;;
 
-        # 414903) get prepared, https://github.com/TheAssassin/type3-runtime
-        *) echo "Unsupported AppImage Signature: $appimageType";;
+        # 3) get ready, https://github.com/TheAssassin/type3-runtime
+        *) echo "Unsupported AppImage Type: $appimageType";;
       esac
     '';
   };