From 905edeb1c478b979f8783e4efde1c11fb291dca0 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Mon, 3 Feb 2025 11:11:48 +0900
Subject: [PATCH] WORKFLOW: changing push action - fix2 [skip ci]

---
 .github/workflows/flathub_push_main.yml | 7 ++++---
 automation_tools/flathub_push_main.sh   | 6 +++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/flathub_push_main.yml b/.github/workflows/flathub_push_main.yml
index 45c6fd05..02bf7cc2 100644
--- a/.github/workflows/flathub_push_main.yml
+++ b/.github/workflows/flathub_push_main.yml
@@ -26,11 +26,12 @@ jobs:
         uses: EndBug/add-and-commit@v9
         with:
           message: "Updated flathub/net.retrodeck.retrodeck to v${{ env.RELNAME }} from RetroDECK/${{ env.RD_BRANCH }}"
-          new_branch: "${{ env.RD_BRANCH }}"
+          new_branch: "${{ env.RELNAME }}"
           cwd: "${{ env.FOLDER_TO_PUSH }}"
           push: 'origin ${{ env.TARGET_REPO }} --set-upstream --force'
           author_email: ${{ secrets.GITMAIL }}
           committer_email: ${{ secrets.GITNAME }}
           add: "*"
-          tag: "v${{ env.RD_BRANCH }}"
-          tag_push: '--force'
\ No newline at end of file
+          tag: "v${{ env.RELNAME }} --force"
+          default_author: "Rekku"
+          committer_name: "Rekku"
\ No newline at end of file
diff --git a/automation_tools/flathub_push_main.sh b/automation_tools/flathub_push_main.sh
index c878f8f2..89d03f4e 100755
--- a/automation_tools/flathub_push_main.sh
+++ b/automation_tools/flathub_push_main.sh
@@ -3,7 +3,11 @@
 # EDITABLES:
 #rd_branch=${GITHUB_REF_NAME} # should be main
 
-gits_folder="/tmp/${GITHUB_WORKSPACE}/gits" # without last /
+if [ -z "${GITHUB_WORKSPACE}" ]; then
+    GITHUB_WORKSPACE="."
+fi
+
+gits_folder="${GITHUB_WORKSPACE}/tmp/gits" # without last /
 
 rd_branch="main"
 flathub_target_repo='flathub/net.retrodeck.retrodeck'