From 0075b60552e78099eba7ce13c01e55a40772437c Mon Sep 17 00:00:00 2001
From: Bernhard Suttner <suttner@atix.de>
Date: Tue, 28 Jan 2025 09:01:23 +0100
Subject: [PATCH] Fix version number in pkg2appimage

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 23de30aa..d070742e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,6 +27,8 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
+      with:
+        fetch-depth: 1
 
     - name: Print configuration
       run: echo "Running build on ${{ matrix.config }}"
@@ -35,7 +37,16 @@ jobs:
       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
+        apt-get install -y sudo libarchive-tools curl zsync squashfs-tools aria2 desktop-file-utils wget fuse binutils file imagemagick gcc git
+        echo "current dir"
+        pwd
+        echo "list all"
+        ls -la
+        echo "Github workspace is: $GITHUB_WORKSPACE"
+        echo "set github ws"
+        git config --global --add safe.directory "$GITHUB_WORKSPACE"
+        echo "current config"
+        git config -l
 
     - name: Build pkg2appimage
       run: |
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}"