Prepare v0.1.3 AppImage fix

packaging/build-appimage.sh

@@ -3,6 +3,7 @@ set -euo pipefail
 
 root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 linuxdeploy="${LINUXDEPLOY:-linuxdeploy-x86_64.AppImage}"
+appimagetool="${APPIMAGETOOL:-}"
 output_dir="${OUTPUT_DIR:-${root_dir}/dist}"
 package_id="$(cargo pkgid --manifest-path "${root_dir}/Cargo.toml")"
 version="${package_id##*@}"
@@ -16,34 +17,47 @@ trap cleanup EXIT
 
 cargo build --manifest-path "${root_dir}/Cargo.toml" --release
 mkdir -p "${output_dir}"
-mkdir -p "${app_dir}/usr/share/metainfo"
+mkdir -p \
+    "${app_dir}/usr/bin" \
+    "${app_dir}/usr/share/applications" \
+    "${app_dir}/usr/share/icons/hicolor/scalable/apps" \
+    "${app_dir}/usr/share/metainfo"
+install -m 0755 "${root_dir}/target/release/comicviewer" "${app_dir}/usr/bin/comicviewer"
+install -m 0755 "${root_dir}/packaging/AppRun" "${app_dir}/AppRun"
+install -m 0644 \
+    "${root_dir}/data/io.github.comicviewer.Comicviewer.desktop" \
+    "${app_dir}/io.github.comicviewer.Comicviewer.desktop"
+install -m 0644 \
+    "${root_dir}/data/io.github.comicviewer.Comicviewer.desktop" \
+    "${app_dir}/usr/share/applications/io.github.comicviewer.Comicviewer.desktop"
+install -m 0644 \
+    "${root_dir}/data/io.github.comicviewer.Comicviewer.svg" \
+    "${app_dir}/io.github.comicviewer.Comicviewer.svg"
+install -m 0644 \
+    "${root_dir}/data/io.github.comicviewer.Comicviewer.svg" \
+    "${app_dir}/usr/share/icons/hicolor/scalable/apps/io.github.comicviewer.Comicviewer.svg"
 install -m 0644 \
     "${root_dir}/data/io.github.comicviewer.Comicviewer.metainfo.xml" \
     "${app_dir}/usr/share/metainfo/io.github.comicviewer.Comicviewer.appdata.xml"
 
 output_path="${output_dir}/Comicviewer-${version}-x86_64.AppImage"
-export LDAI_OUTPUT="${output_path}"
-export PATH="$(dirname "${linuxdeploy}"):${PATH}"
-export APPIMAGE_EXTRACT_AND_RUN=1
-export NO_STRIP=1
 
-# The GTK plugin assumes this optional module directory exists on every distro.
-gtk_plugin="$(command -v linuxdeploy-plugin-gtk.sh || true)"
-if [[ -n "${gtk_plugin}" ]] && [[ ! -d "$(pkg-config --variable=libdir gtk4)/gtk-4.0" ]]; then
-    patched_plugin="${work_dir}/linuxdeploy-plugin-gtk.sh"
-    cp "${gtk_plugin}" "${patched_plugin}"
-    sed -i 's|        copy_lib_tree "$gtk4_libdir" "$APPDIR/"|        if [ -d "$gtk4_libdir" ]; then copy_lib_tree "$gtk4_libdir" "$APPDIR/"; fi|' "${patched_plugin}"
-    chmod +x "${patched_plugin}"
-    export PATH="${work_dir}:${PATH}"
+if [[ -z "${appimagetool}" ]]; then
+    linuxdeploy_path="$(command -v "${linuxdeploy}" || true)"
+    if [[ -z "${linuxdeploy_path}" ]]; then
+        printf '%s\n' "APPIMAGETOOL 또는 LINUXDEPLOY를 지정하세요." >&2
+        exit 1
+    fi
+    tool_dir="${work_dir}/appimage-tools"
+    mkdir -p "${tool_dir}"
+    (
+        cd "${tool_dir}"
+        "${linuxdeploy_path}" --appimage-extract >/dev/null
+    )
+    appimagetool="${tool_dir}/squashfs-root/plugins/linuxdeploy-plugin-appimage/usr/bin/appimagetool"
 fi
 
-"${linuxdeploy}" \
-    --appdir "${app_dir}" \
-    --executable "${root_dir}/target/release/comicviewer" \
-    --desktop-file "${root_dir}/data/io.github.comicviewer.Comicviewer.desktop" \
-    --icon-file "${root_dir}/data/io.github.comicviewer.Comicviewer.svg" \
-    --custom-apprun "${root_dir}/packaging/AppRun" \
-    --plugin gtk \
-    --output appimage
+env ARCH=x86_64 APPIMAGE_EXTRACT_AND_RUN=1 \
+    "${appimagetool}" "${app_dir}" "${output_path}"
 
 echo "Created ${output_path}"

packaging/build-release-bundle.sh

@@ -10,8 +10,6 @@ appimage="${root_dir}/dist/${appimage_name}"
 checksum="${appimage}.sha256"
 archive="${root_dir}/dist/${bundle_name}.tar.gz"
 archive_checksum="${archive}.sha256"
-parts_checksum="${archive}.parts.sha256"
-split_installer="${root_dir}/dist/${bundle_name}-install.sh"
 work_dir="$(mktemp -d)"
 bundle_dir="${work_dir}/${bundle_name}"
 archive_mtime="${SOURCE_DATE_EPOCH:-$(git -C "${root_dir}" log -1 --format=%ct)}"
@@ -51,14 +49,7 @@ tar --sort=name --owner=0 --group=0 --numeric-owner --mtime="@${archive_mtime}"
 (
     cd "${root_dir}/dist"
     sha256sum "$(basename "${archive}")" > "$(basename "${archive_checksum}")"
-    rm -f "$(basename "${archive}").part-"* "$(basename "${parts_checksum}")"
-    split --bytes=8M --numeric-suffixes=0 --suffix-length=2 \
-        "$(basename "${archive}")" "$(basename "${archive}").part-"
-    sha256sum "$(basename "${archive}").part-"* > "$(basename "${parts_checksum}")"
 )
-install -m 0755 "${root_dir}/packaging/install-split-release.sh" "${split_installer}"
 
 printf 'Created %s\n' "${archive}"
 printf 'Created %s\n' "${archive_checksum}"
-printf 'Created %s and split parts\n' "${parts_checksum}"
-printf 'Created %s\n' "${split_installer}"

packaging/install-split-release.sh

@@ -1,70 +0,0 @@
-#!/usr/bin/env sh
-set -eu
-
-script_dir="$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)"
-temporary_archive=""
-extract_dir=""
-
-case "$#:${1:-}" in
-    0:) action="" ;;
-    1:--uninstall) action="--uninstall" ;;
-    *)
-        printf '사용법: %s [--uninstall]\n' "$(basename -- "$0")" >&2
-        exit 2
-        ;;
-esac
-
-cleanup() {
-    [ -z "${temporary_archive}" ] || rm -f "${temporary_archive}"
-    [ -z "${extract_dir}" ] || rm -rf "${extract_dir}"
-}
-trap cleanup EXIT HUP INT TERM
-
-set -- "${script_dir}"/Comicviewer-*-x86_64.tar.gz.parts.sha256
-if [ "$#" -ne 1 ] || [ ! -f "$1" ]; then
-    printf '%s\n' "분할 파일 체크섬 목록 한 개를 찾을 수 없습니다." >&2
-    exit 1
-fi
-
-parts_checksum="$1"
-archive_name="$(basename -- "${parts_checksum%.parts.sha256}")"
-archive_checksum="${script_dir}/${archive_name}.sha256"
-
-if [ ! -f "${archive_checksum}" ]; then
-    printf '필수 파일이 없습니다: %s\n' "$(basename -- "${archive_checksum}")" >&2
-    exit 1
-fi
-
-set -- "${script_dir}/${archive_name}.part-"*
-if [ ! -f "$1" ]; then
-    printf '%s\n' "분할 번들 파일을 찾을 수 없습니다." >&2
-    exit 1
-fi
-
-(cd "${script_dir}" && sha256sum -c "$(basename -- "${parts_checksum}")")
-
-temporary_archive="$(mktemp "${TMPDIR:-/tmp}/comicviewer-bundle.XXXXXX.tar.gz")"
-cat "$@" > "${temporary_archive}"
-
-IFS=' ' read -r expected_checksum _ < "${archive_checksum}"
-actual_checksum="$(sha256sum "${temporary_archive}")"
-actual_checksum="${actual_checksum%% *}"
-if [ "${actual_checksum}" != "${expected_checksum}" ]; then
-    printf '%s\n' "조립한 통합 번들의 체크섬이 일치하지 않습니다." >&2
-    exit 1
-fi
-
-extract_dir="$(mktemp -d "${TMPDIR:-/tmp}/comicviewer-install.XXXXXX")"
-tar -xzf "${temporary_archive}" -C "${extract_dir}"
-bundle_dir="${extract_dir}/${archive_name%.tar.gz}"
-
-if [ ! -x "${bundle_dir}/install-or-update.sh" ]; then
-    printf '%s\n' "통합 번들에서 설치 스크립트를 찾을 수 없습니다." >&2
-    exit 1
-fi
-
-if [ -n "${action}" ]; then
-    "${bundle_dir}/install-or-update.sh" "${action}"
-else
-    "${bundle_dir}/install-or-update.sh"
-fi