From f4e3843950c744c42f513f15459dd74574db6d1d Mon Sep 17 00:00:00 2001
From: Pablo Curiel <pabloacurielz@gmail.com>
Date: Mon, 20 Mar 2023 17:48:21 +0100
Subject: [PATCH] More workflow changes

---
 .github/workflows/rewrite.yml | 38 ++++++++++++++---------------------
 source/core/usb.c             |  2 +-
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/rewrite.yml b/.github/workflows/rewrite.yml
index d91f1c9..6af77b0 100644
--- a/.github/workflows/rewrite.yml
+++ b/.github/workflows/rewrite.yml
@@ -24,55 +24,47 @@ jobs:
           sudo -n apt-get upgrade -y patch autoconf automake tar bzip2 diffutils pkgconf fakeroot p7zip-full git
           sudo -n dkp-pacman -Syu --needed --noconfirm
 
-      - name: Checkout latest nxdumptool-rewrite commit
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
+      - name: Silence all git safe directory warnings
+        run: git config --global --add safe.directory '*'
 
-      # Workaround: manually use git instead of actions/checkout to overcome a 'missing token' error with act.
-      #- name: Checkout latest libnx commit
-      #  run: |
-      #    cd "$GITHUB_WORKSPACE/libs"
-      #    git clone --recurse-submodules https://github.com/switchbrew/libnx.git
+      # Workaround: manually use git instead of actions/checkout to parse repository properties (e.g. branch name, commit hash, etc.) on our own.
+      - name: Checkout latest nxdumptool-rewrite commit
+        run: |
+          cd "$GITHUB_WORKSPACE"
+          git clone --branch rewrite --recurse-submodules https://github.com/DarkMatterCore/nxdumptool.git
 
       - name: Checkout latest libnx commit
-        uses: actions/checkout@v3
-        with:
-          repository: switchbrew/libnx
-          submodules: recursive
-          path: libs/libnx
+        run: |
+          cd "$GITHUB_WORKSPACE"
+          git clone --recurse-submodules https://github.com/switchbrew/libnx.git
 
       - name: Set workspace permissions
         run: chmod 777 -R "$GITHUB_WORKSPACE"
 
       - name: Build and install libnx
         run: |
-          cd "$GITHUB_WORKSPACE/libs/libnx"
+          cd "$GITHUB_WORKSPACE/libnx"
           sudo --preserve-env=DEVKITPRO,DEVKITARM,DEVKITPPC -n make install -j$(nproc)
 
-      # Workaround for Docker image bug (see https://github.com/actions/checkout/issues/1169).
-      - name: "Workaround: add git safe directory (libusbhsfs)"
-        run: git config --system --add safe.directory "$GITHUB_WORKSPACE/libs/libusbhsfs"
-
       - name: Build libusbhsfs dependencies
         run: |
-          cd "$GITHUB_WORKSPACE/libs/libusbhsfs"
+          cd "$GITHUB_WORKSPACE/nxdumptool/libs/libusbhsfs"
           sudo --preserve-env=DEVKITPRO,DEVKITARM,DEVKITPPC -n make fs-libs -j$(nproc)
 
       - name: Build nxdumptool
         run: |
-          cd "$GITHUB_WORKSPACE"
+          cd "$GITHUB_WORKSPACE/nxdumptool"
           export COMMIT=$(git rev-parse --short HEAD)
           ./build.sh
 
       - uses: actions/upload-artifact@v3
         with:
-          name: nxdumptool rewrite (NRO) - ${{ env.COMMIT }}.7z
+          name: nxdumptool-rewrite_poc_${{ env.COMMIT }}.7z
           path: nxdumptool-rewrite_poc_${{ env.COMMIT }}.7z
           if-no-files-found: error
 
       - uses: actions/upload-artifact@v3
         with:
-          name: nxdumptool rewrite (Debug ELF) - ${{ env.COMMIT }}.7z
+          name: nxdumptool-rewrite_poc_${{ env.COMMIT }}-Debug_ELFs.7z
           path: nxdumptool-rewrite_poc_${{ env.COMMIT }}-Debug_ELFs.7z
           if-no-files-found: error
diff --git a/source/core/usb.c b/source/core/usb.c
index 4e472d7..d4f9ff7 100644
--- a/source/core/usb.c
+++ b/source/core/usb.c
@@ -623,7 +623,7 @@ static bool usbStartSession(void)
     cmd_block->app_ver_minor = VERSION_MINOR;
     cmd_block->app_ver_micro = VERSION_MICRO;
     cmd_block->abi_version = USB_ABI_VERSION;
-    snprintf(cmd_block->git_commit, sizeof(cmd_block->git_commit), GIT_COMMIT);
+    snprintf(cmd_block->git_commit, sizeof(cmd_block->git_commit), "%s", GIT_COMMIT);
 
     ret = usbSendCommand();
     if (ret)