appimage: replace writeScript to a standalone appimage-exec.sh

This commit is contained in:
Bignaux Ronan 2020-03-05 23:57:36 +01:00
parent 349e923e00
commit b36d3f2c4a
4 changed files with 155 additions and 113 deletions

View file

@ -0,0 +1,129 @@
#!@shell@
if [ ! -z "$DEBUG" ] ; then
set -x
fi
export PATH=@path@
# src : AppImage
# dest : let's unpack() create the directory
unpack() {
src=$1
out=$2
# https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63
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 -1
fi
case "$appimageType" in
1) echo "Uncompress $(basename "$src") of Type: $appimageType."
mkdir "$out"
pv "$src" | bsdtar -x -C "$out" -f -
;;
2) echo "Uncompress $(basename "$src") of Type: $appimageType."
# This method avoid issues with non executable appimages,
# non-native packer, packer patching and squashfs-root destination prefix.
# multiarch offset one-liner using same method as AppImage
# see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93
offset=$(r2 "$src" -nn -Nqc "pfj.elf_header @ 0" |\
jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)')
unsquashfs -q -d "$out" -o "$offset" "$src"
chmod go-w "$out"
;;
# 3) get ready, https://github.com/TheAssassin/type3-runtime
*) echo Unsupported AppImage Type: "$appimageType"
exit
;;
esac
echo "$(basename "$src") is now installed in $out"
}
apprun() {
eval "$(rahash2 "$APPIMAGE" -j | jq -r '.[] | @sh "SHA256=\(.hash)"')"
echo sha256 = \"$SHA256\"\;
export APPDIR="${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256"
#compatibility
if [ -x "$APPDIR/squashfs-root" ]; then APPDIR="$APPDIR/squashfs-root"; fi
if [ ! -x "$APPDIR" ]; then
mkdir -p $(dirname "$APPDIR")
unpack "$APPIMAGE" "$APPDIR"
fi
echo $(basename "$APPIMAGE") installed in "$APPDIR"
export PATH="$PATH:$PWD/usr/bin"
wrap
}
wrap() {
cd "$APPDIR"
# quite same in appimageTools
export APPIMAGE_SILENT_INSTALL=1
if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then
exec "$APPIMAGE_DEBUG_EXEC"
fi
exec ./AppRun "$@"
}
usage() {
echo "Usage: appimage-run [appimage-run options] <AppImage> [AppImage options]";
echo
echo 'Options are passed on to the appimage.'
echo "If you want to execute a custom command in the appimage's environment, set the APPIMAGE_DEBUG_EXEC environment variable."
exit 1
}
while getopts ":a:d:xrw" option; do
case "${option}" in
a) #AppImage file
# why realpath?
APPIMAGE="$(realpath "${OPTARG}")"
;;
d) #appimage Directory
export APPDIR=${OPTARG}
;;
x) # eXtract
unpack_opt=true
;;
r) # appimage-Run
apprun_opt=true
;;
w) # WrapAppImage
wrap_opt=true
;;
*)
usage
;;
esac
done
shift $((OPTIND-1))
if [[ $unpack_opt = true ]] && [[ -f "$APPIMAGE" ]]; then
unpack "$APPIMAGE" "$APPDIR"
exit
fi
if [[ $apprun_opt = true ]] && [[ -f "$APPIMAGE" ]]; then
apprun
fi
if [[ $wrap_opt = true ]] && [[ -d "$APPDIR" ]]; then
wrap
fi

View file

@ -1,61 +1,35 @@
{ stdenv, libarchive, radare2, jq, buildFHSUserEnv, squashfsTools, writeScript }:
{ stdenv, buildFHSUserEnv, writeScript, pkgs
, bash, radare2, jq, squashfsTools, ripgrep
, coreutils, libarchive, file, runtimeShell, pv
, lib, runCommand }:
rec {
extract = { name, src }: stdenv.mkDerivation {
name = "${name}-extracted";
inherit src;
nativeBuildInputs = [ radare2 libarchive jq squashfsTools ];
buildCommand = ''
# https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63
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
1)
mkdir $out
bsdtar -x -C $out -f $src
;;
2)
# multiarch offset one-liner using same method as AppImage
# see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93
offset=$(r2 $src -nn -Nqc "pfj.elf_header @ 0" |\
jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)')
unsquashfs -q -d $out -o $offset $src
chmod go-w $out
;;
# 3) get ready, https://github.com/TheAssassin/type3-runtime
*) echo "Unsupported AppImage Type: $appimageType";;
esac
'';
appimage-exec = pkgs.substituteAll {
src = ./appimage-exec.sh;
isExecutable = true;
dir = "bin";
path = with pkgs; lib.makeBinPath [ pv ripgrep file radare2 libarchive jq squashfsTools coreutils bash ];
};
extract = { name, src }: runCommand "${name}-extracted" {
buildInputs = [ appimage-exec ];
} ''
appimage-exec.sh -x -d $out -a ${src}
'';
# for compatibility, deprecated
extractType1 = extract;
extractType2 = extract;
#wrapType2 = wrapAppImage;
#wrapType1 = wrapAppImage;
wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // {
inherit name;
targetPkgs = pkgs: defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
targetPkgs = pkgs: [ appimage-exec ]
++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
runScript = writeScript "run" ''
#!${stdenv.shell}
export APPDIR=${src}
export APPIMAGE_SILENT_INSTALL=1
cd $APPDIR
exec ./AppRun "$@"
'';
runScript = "appimage-exec.sh -w -d ${src}";
} // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));
wrapType1 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // {

View file

@ -1,43 +0,0 @@
#!@bash@/bin/bash
if [ $# -eq 0 ]; then
echo "Usage: $0 FILE [OPTION...]"
echo
echo 'Options are passed on to the appimage.'
echo "If you want to execute a custom command in the appimage's environment, set the APPIMAGE_DEBUG_EXEC environment variable."
exit 1
fi
APPIMAGE="$(realpath "$1")"
shift
if [ ! -x "$APPIMAGE" ]; then
echo "fatal: $APPIMAGE is not executable"
exit 1
fi
SHA256="$(@coreutils@/bin/sha256sum "$APPIMAGE" | cut -d ' ' -f 1)"
SQUASHFS_ROOT="''${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256/"
mkdir -p "$SQUASHFS_ROOT"
export APPDIR="$SQUASHFS_ROOT/squashfs-root"
if [ ! -x "$APPDIR" ]; then
cd "$SQUASHFS_ROOT"
if @file@/bin/file --mime-type --brief --keep-going "$APPIMAGE" | grep -q iso; then
# is type-1 appimage
mkdir "$APPDIR"
@libarchive@/bin/bsdtar -x -C "$APPDIR" -f "$APPIMAGE"
else
# is type-2 appimage
"$APPIMAGE" --appimage-extract 2>/dev/null
fi
fi
cd "$APPDIR"
export PATH="$PATH:$PWD/usr/bin"
export APPIMAGE_SILENT_INSTALL=1
if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then
exec "$APPIMAGE_DEBUG_EXEC"
fi
exec ./AppRun "$@"

View file

@ -1,31 +1,13 @@
{ buildFHSUserEnv, coreutils, file, libarchive, runtimeShell
, extraPkgs ? pkgs: [], appimageTools, stdenv, bash }:
{ appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [] }:
let
name = "appimage-run";
version = "1.0";
fhsArgs = appimageTools.defaultFhsEnvArgs;
appimage-exec = stdenv.mkDerivation {
#inherit pname version;
name = "appimage-exec";
inherit coreutils file libarchive bash;
buildCommand = ''
mkdir -p $out/bin/
substituteAll ${./appimage-exec.sh} $out/bin/appimage-exec.sh
chmod +x $out/bin/appimage-exec.sh
'';
};
in buildFHSUserEnv (fhsArgs // {
inherit name;
name = "appimage-run";
targetPkgs = pkgs:
[ appimage-exec
] ++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs;
#extraInstallCommands = '''';
runScript = "appimage-exec.sh";
targetPkgs = pkgs: [ appimageTools.appimage-exec ]
++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs;
runScript = "appimage-exec.sh -r -a";
})