public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bignaux Ronan 2020-03-05 18:53:11 +01:00
parent bf83a7cc66
commit 349e923e00
2 changed files with 65 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pkgs/tools/package-management/appimage-run/appimage-exec.sh Executable file
View File

@ -0,0 +1,43 @@
#!@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 "$@"

69
pkgs/tools/package-management/appimage-run/default.nix
View File

@ -1,56 +1,31 @@
{ writeScript, buildFHSUserEnv, coreutils, file, libarchive, runtimeShell { buildFHSUserEnv, coreutils, file, libarchive, runtimeShell
, extraPkgs ? pkgs: [], appimageTools }: , extraPkgs ? pkgs: [], appimageTools, stdenv, bash }:
let let
fhsArgs = appimageTools.defaultFhsEnvArgs;
in buildFHSUserEnv (fhsArgs // {
name = "appimage-run"; name = "appimage-run";
version = "1.0";
fhsArgs = appimageTools.defaultFhsEnvArgs;
targetPkgs = pkgs: fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs; appimage-exec = stdenv.mkDerivation {
#inherit pname version;
name = "appimage-exec";
runScript = writeScript "appimage-exec" '' inherit coreutils file libarchive bash;
#!${runtimeShell}
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 buildCommand = ''
echo "fatal: $APPIMAGE is not executable" mkdir -p $out/bin/
exit 1 substituteAll ${./appimage-exec.sh} $out/bin/appimage-exec.sh
fi chmod +x $out/bin/appimage-exec.sh
'';
};
SHA256="$(${coreutils}/bin/sha256sum "$APPIMAGE" | cut -d ' ' -f 1)" in buildFHSUserEnv (fhsArgs // {
SQUASHFS_ROOT="''${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256/" inherit name;
mkdir -p "$SQUASHFS_ROOT"
export APPDIR="$SQUASHFS_ROOT/squashfs-root" targetPkgs = pkgs:
if [ ! -x "$APPDIR" ]; then [ appimage-exec
cd "$SQUASHFS_ROOT" ] ++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs;
#extraInstallCommands = '''';
if ${file}/bin/file --mime-type --brief --keep-going "$APPIMAGE" | grep -q iso; then runScript = "appimage-exec.sh";
# 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 "$@"
'';
}) })