From 6bbc609556a95c80ec5dfe089cbe6d4e3cfde4da Mon Sep 17 00:00:00 2001 From: Lancelot MAY Date: Tue, 28 Oct 2025 16:13:25 +0000 Subject: [PATCH 1/2] Fix issue of independent mode under ubuntu --- scripts/build-deb.sh | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/scripts/build-deb.sh b/scripts/build-deb.sh index 8abf0e4..3a903c0 100755 --- a/scripts/build-deb.sh +++ b/scripts/build-deb.sh @@ -26,31 +26,28 @@ build_deb() { # Create package structure local pkg_dir="${pkg_name}-${VERSION}-${arch}" mkdir -p "$pkg_dir/DEBIAN" + mkdir -p "$pkg_dir/usr/lib/aictionary" mkdir -p "$pkg_dir/usr/bin" mkdir -p "$pkg_dir/usr/share/applications" mkdir -p "$pkg_dir/usr/share/pixmaps" # Copy binary if [ -f "artifacts/$artifact_dir/Aictionary" ]; then - cp "artifacts/$artifact_dir/Aictionary" "$pkg_dir/usr/bin/" - chmod +x "$pkg_dir/usr/bin/Aictionary" + cp -r "artifacts/$artifact_dir/"* "$pkg_dir/usr/lib/aictionary/" + chmod +x "$pkg_dir/usr/lib/aictionary/Aictionary" else echo "Warning: Binary not found in artifacts/$artifact_dir/" return 1 fi - - # Copy additional files for framework-dependent version - if [ "$package_type" = "framework-dependent" ]; then - find "artifacts/$artifact_dir" -name "*.dll" -o -name "*.so" -o -name "*.json" -o -name "*.pdb" | while read file; do - if [ -f "$file" ]; then - cp "$file" "$pkg_dir/usr/bin/" - fi - done - # Copy Assets directory if exists - if [ -d "artifacts/$artifact_dir/Assets" ]; then - cp -r "artifacts/$artifact_dir/Assets" "$pkg_dir/usr/bin/" - fi - fi + + # Create wrapper script + cat > "$pkg_dir/usr/bin/Aictionary" << EOF +#!/bin/bash +DIR=/usr/lib/aictionary +export LD_LIBRARY_PATH=\$DIR:\$LD_LIBRARY_PATH +exec "\$DIR/Aictionary" "\$@" +EOF + chmod +x "$pkg_dir/usr/bin/Aictionary" # Create control file { From 0a87f2094128b1d157152f1beed7a41c7b18e257 Mon Sep 17 00:00:00 2001 From: Lancelot MAY Date: Tue, 28 Oct 2025 16:35:42 +0000 Subject: [PATCH 2/2] fix issue of ubuntu packaging - move lib to /usr/lib/ --- scripts/build-deb.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/build-deb.sh b/scripts/build-deb.sh index 3a903c0..72641ad 100755 --- a/scripts/build-deb.sh +++ b/scripts/build-deb.sh @@ -39,6 +39,19 @@ build_deb() { echo "Warning: Binary not found in artifacts/$artifact_dir/" return 1 fi + # Copy additional files for framework-dependent version + if [ "$package_type" = "framework-dependent" ]; then + find "artifacts/$artifact_dir" \ + -name "*.dll" -o -name "*.so" -o -name "*.json" -o -name "*.pdb" | while read file; do + if [ -f "$file" ]; then + cp "$file" "$pkg_dir/usr/lib/aictionary/" + fi + done + # Copy Assets directory if exists + if [ -d "artifacts/$artifact_dir/Assets" ]; then + cp -r "artifacts/$artifact_dir/Assets" "$pkg_dir/usr/lib/aictionary/" + fi + fi # Create wrapper script cat > "$pkg_dir/usr/bin/Aictionary" << EOF