From 1eceb306077e51b991e987690b364e11971b44b3 Mon Sep 17 00:00:00 2001
From: Bernhard Suttner <sbernhard@users.noreply.github.com>
Date: Sun, 2 Feb 2025 09:41:39 +0100
Subject: [PATCH] Fix version number in pkg2appimage (#567)

---
 .github/workflows/build.yml | 15 +++++++++------
 README.md                   |  2 +-
 dogfeeding.sh               |  5 ++++-
 functions.sh                |  2 ++
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3111f9ff..75b75074 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,18 +25,21 @@ jobs:
       image: ${{ matrix.config.image }}
       options: --privileged
     steps:
+    - name: Install dependencies
+      run: |
+        export DEBIAN_FRONTEND="noninteractive"
+        apt-get update
+        apt-get install -y sudo libarchive-tools curl zsync squashfs-tools aria2 desktop-file-utils wget fuse binutils file imagemagick gcc git
+        git config --global --add safe.directory "$GITHUB_WORKSPACE"
+
     - name: Checkout code
       uses: actions/checkout@v4
+      with:
+        fetch-depth: 1
 
     - name: Print configuration
       run: echo "Running build on ${{ matrix.config }}"
 
-    - name: Install dependencies
-      run: |
-        export DEBIAN_FRONTEND="noninteractive"
-        apt-get update
-        apt-get install -y sudo libarchive-tools curl zsync squashfs-tools aria2 desktop-file-utils wget fuse binutils file imagemagick gcc
-
     - name: Build pkg2appimage
       run: |
         bash -ex dogfeeding.sh
diff --git a/README.md b/README.md
index 64078c4f..f6ce220c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# pkg2appimage [![Build Status](https://travis-ci.org/AppImage/pkg2appimage.svg)](https://travis-ci.org/AppImage/pkg2appimage) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZT9CL8M5TJU72)
+# pkg2appimage [![Build Status](https://github.com/AppImageCommunity/pkg2appimage/actions/workflows/build.yml/badge.svg)](https://github.com/AppImageCommunity/pkg2appimage/actions/workflows/build.yml) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZT9CL8M5TJU72)
 
 [Download as an AppImage](../../releases/tag/continuous)
  
diff --git a/dogfeeding.sh b/dogfeeding.sh
index c9379d9e..91212348 100644
--- a/dogfeeding.sh
+++ b/dogfeeding.sh
@@ -4,6 +4,9 @@
 
 HERE="$(dirname "$(readlink -f "${0}")")"
 
+GIT_SHORT_REV=$(git rev-parse --short HEAD)
+echo "Using git short revision: $GIT_SHORT_REV"
+
 . ./functions.sh
 
 mkdir -p build/
@@ -50,4 +53,4 @@ delete_blacklisted
 rm usr/lib/*-gnu/liblzma.so.5
 
 cd ..
-NO_GLIBC_VERSION=true APP=pkg2appimage VERSION=$(git rev-parse --short HEAD) generate_type2_appimage # FIXME: This embeds bintray-zsync
+NO_GLIBC_VERSION=true APP=pkg2appimage VERSION=$GIT_SHORT_REV generate_type2_appimage # FIXME: This embeds bintray-zsync
diff --git a/functions.sh b/functions.sh
index 80b41075..9e986293 100644
--- a/functions.sh
+++ b/functions.sh
@@ -252,6 +252,8 @@ generate_type2_appimage()
 
   set +x
 
+  echo "Using version $VERSION_EXPANDED for pkg2appimage"
+
   GLIBC_NEEDED=$(glibc_needed)
   _APP_DIR="${PWD}/$APP.AppDir/"
   export OWD="${PWD}"