From 2975a9f70b6059075b883d143ba7845fb66c9c8b Mon Sep 17 00:00:00 2001
From: Eric Wheeler <xnec2c-git@z.ewheeler.org>
Date: Wed, 14 Aug 2024 17:49:16 -0700
Subject: [PATCH] github: fix build-appimage

---
 .github/workflows/build-appimage.yml | 19 ++++++-------------
 appimage-builder.yml                 |  8 +-------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build-appimage.yml b/.github/workflows/build-appimage.yml
index de0355d..f0d3a27 100644
--- a/.github/workflows/build-appimage.yml
+++ b/.github/workflows/build-appimage.yml
@@ -36,12 +36,6 @@ jobs:
           echo "VERSION=$VERSION" >> $GITHUB_ENV
           echo "DIST=$DIST" >> $GITHUB_ENV
 
-      - name: Install Dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y python3 python3-pip
-          pip3 install appimage-builder
-
       - name: Build AppImage
         run: |
           docker run --rm -v $(pwd):/workspace -w /workspace centos:7 /bin/bash -c "
@@ -67,19 +61,18 @@ jobs:
             echo 'Building the application...'
             ./autogen.sh && ./configure && make
 
-            # Prepare directories
-            echo 'Preparing directories...'
+            # Prepare AppDir and copy necessary files
+            echo 'Preparing AppDir...'
             mkdir -p AppDir/usr/bin AppDir/usr/share/icons/hicolor/scalable/apps AppDir/usr/share/applications
 
             # Install the application into AppDir
             echo 'Installing the application...'
             make install DESTDIR=$(pwd)/AppDir
 
-            # Copy necessary resources
-            echo 'Copying resources...'
-            cp src/xnec2c AppDir/usr/bin/
-            cp resources/xnec2c.svg AppDir/usr/share/icons/hicolor/scalable/apps/
-            cp files/xnec2c.desktop AppDir/usr/share/applications/
+            # Manually copy files to their destinations within AppDir
+            cp src/xnec2c AppDir/usr/bin/xnec2c
+            cp resources/xnec2c.svg AppDir/usr/share/icons/hicolor/scalable/apps/xnec2c.svg
+            cp files/xnec2c.desktop AppDir/usr/share/applications/xnec2c.desktop
           "
 
       - name: Generate AppImage with appimage-builder
diff --git a/appimage-builder.yml b/appimage-builder.yml
index ade15f5..f437a24 100644
--- a/appimage-builder.yml
+++ b/appimage-builder.yml
@@ -5,7 +5,7 @@ AppDir:
   app_info:
     id: xnec2c
     name: xnec2c
-    icon: resources/xnec2c
+    icon: usr/share/icons/hicolor/scalable/apps/xnec2c.svg
     exec: usr/bin/xnec2c
     exec_args: "$@"
     version: "${VERSION}${DIST}"
@@ -21,12 +21,6 @@ AppDir:
       - fuse
       - other-dependencies
 
-  files:
-    include:
-      - src/xnec2c: usr/bin/xnec2c
-      - resources/xnec2c.svg: usr/share/icons/hicolor/scalable/apps/xnec2c.svg
-      - files/xnec2c.desktop: usr/share/applications/xnec2c.desktop
-
 AppImage:
   arch: x86_64
   update-information: None