From bee7853fb9f8533e07fe2e7718c973988288f059 Mon Sep 17 00:00:00 2001
From: tobtoht <thotbot@protonmail.com>
Date: Sat, 22 May 2021 21:53:42 +0200
Subject: [PATCH] AppImage: build in ./build

---
 BUILDING.md               | 4 +++-
 contrib/build-appimage.sh | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/BUILDING.md b/BUILDING.md
index 68e130d7..16ea8eab 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -49,9 +49,11 @@ The resulting binary can be found in `build/bin/feather`.
 First create the standalone binary using the Docker command in the previous step.
 
 ```bash
-docker run --rm -it -v $PWD:/feather -w /feather feather:linux contrib/build-appimage.sh
+docker run --rm -it -v $PWD:/feather -w /feather/build feather:linux ../contrib/build-appimage.sh
 ```
 
+The resulting AppImage will be located in `./build`.
+
 ### Windows (reproducible)
 
 #### 1. Clone
diff --git a/contrib/build-appimage.sh b/contrib/build-appimage.sh
index c68b5039..3ba81573 100755
--- a/contrib/build-appimage.sh
+++ b/contrib/build-appimage.sh
@@ -4,13 +4,14 @@ set -e
 unset SOURCE_DATE_EPOCH
 
 APPDIR="$PWD/feather.AppDir"
+rm -rf $APPDIR
 mkdir -p "$APPDIR"
 mkdir -p "$APPDIR/usr/share/applications/"
 mkdir -p "$APPDIR/usr/bin"
 
-cp "$PWD/src/assets/feather.desktop" "$APPDIR/usr/share/applications/feather.desktop"
-cp "$PWD/src/assets/images/appicons/64x64.png" "$APPDIR/feather.png"
-cp "$PWD/build/bin/feather" "$APPDIR/usr/bin/feather"
+cp "$PWD/../src/assets/feather.desktop" "$APPDIR/usr/share/applications/feather.desktop"
+cp "$PWD/../src/assets/images/appicons/64x64.png" "$APPDIR/feather.png"
+cp "$PWD/bin/feather" "$APPDIR/usr/bin/feather"
 
 LD_LIBRARY_PATH=/usr/local/lib /linuxdeployqt/squashfs-root/AppRun feather.AppDir/usr/share/applications/feather.desktop -bundle-non-qt-libs