From 8dad78194fcd18850cebbf462be6fb0116cc5e00 Mon Sep 17 00:00:00 2001
From: Janek Bevendorff <janek@jbev.net>
Date: Sat, 24 Feb 2018 23:20:53 +0100
Subject: [PATCH] Fix libgcrypt and libgpg-errror paths in AppImage, resolves
 #1522

---
 AppImage-Recipe.sh |  8 ++++++--
 release-tool       | 16 +++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/AppImage-Recipe.sh b/AppImage-Recipe.sh
index 2187fde1f..342dd0840 100755
--- a/AppImage-Recipe.sh
+++ b/AppImage-Recipe.sh
@@ -66,14 +66,18 @@ cp "$QXCB_PLUGIN" ".${QT_PLUGIN_PATH}/platforms/"
 
 get_apprun
 copy_deps
+
+# protect our libgpg-error from being deleted
+mv ./opt/gpg-error-127/lib/x86_64-linux-gnu/libgpg-error.so.0 ./protected.so
 delete_blacklisted
+mv ./protected.so ./opt/gpg-error-127/lib/x86_64-linux-gnu/libgpg-error.so.0
 
 get_desktop
 get_icon
 cat << EOF > ./usr/bin/keepassxc_env
 #!/usr/bin/env bash
-export LD_LIBRARY_PATH="/opt/libgcrypt20-18/lib/x86_64-linux-gnu:\${LD_LIBRARY_PATH}"
-export LD_LIBRARY_PATH="/opt/gpg-error-127/lib/x86_64-linux-gnu:\${LD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH="../opt/libgcrypt20-18/lib/x86_64-linux-gnu:\${LD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH="../opt/gpg-error-127/lib/x86_64-linux-gnu:\${LD_LIBRARY_PATH}"
 export LD_LIBRARY_PATH="..$(dirname ${QT_PLUGIN_PATH})/lib:\${LD_LIBRARY_PATH}"
 export QT_PLUGIN_PATH="..${QT_PLUGIN_PATH}:\${KPXC_QT_PLUGIN_PATH}"
 
diff --git a/release-tool b/release-tool
index b08caadba..c0739a0b4 100755
--- a/release-tool
+++ b/release-tool
@@ -619,17 +619,19 @@ build() {
 
         git archive --format=tar "$TAG_NAME" --prefix="${prefix}/" --output="${OUTPUT_DIR}/${tarball_name}"
 
-        # add .version file to tar
-        mkdir "${prefix}"
-        echo -n ${RELEASE_NAME} > "${prefix}/.version"
-        tar --append --file="${OUTPUT_DIR}/${tarball_name}" "${prefix}/.version"
-        rm "${prefix}/.version"
-        rmdir "${prefix}" 2> /dev/null
+        if ! ${BUILD_SNAPSHOT}; then
+            # add .version file to tar
+            mkdir "${prefix}"
+            echo -n ${RELEASE_NAME} > "${prefix}/.version"
+            tar --append --file="${OUTPUT_DIR}/${tarball_name}" "${prefix}/.version"
+            rm "${prefix}/.version"
+            rmdir "${prefix}" 2> /dev/null
+        fi
 
         xz -6 "${OUTPUT_DIR}/${tarball_name}"
     fi
 
-    if [ -e "${OUTPUT_DIR}/build-release" ]; then
+    if ! ${BUILD_SNAPSHOT} && [ -e "${OUTPUT_DIR}/build-release" ]; then
         logInfo "Cleaning existing build directory..."
         rm -r "${OUTPUT_DIR}/build-release" 2> /dev/null
         if [ $? -ne 0 ]; then