From 8f028283cd32694b1bc7c8f6fb00e61c946997cf Mon Sep 17 00:00:00 2001
From: Andrew Lee <andrew.lee@netapp.com>
Date: Wed, 8 Nov 2023 10:13:12 +0100
Subject: [PATCH] Directly use  and  in the inputs and pass the variables to
 podman run.

---
 .github/workflows/build_pkg.yml | 16 ++++++++--------
 container/bin/build_source      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build_pkg.yml b/.github/workflows/build_pkg.yml
index ca157f5..9e5756c 100644
--- a/.github/workflows/build_pkg.yml
+++ b/.github/workflows/build_pkg.yml
@@ -14,10 +14,10 @@ on:
       dependencies:
         type: string
         default: ""
-      email:
+      debemail:
         type: string
         default: "contact@gardenlinux.io"
-      name:
+      debname:
         type: string
         default: "Garden Linux Builder"
       distribution:
@@ -41,8 +41,8 @@ on:
         default: "gl0"
 
 env:
-  INPUT_EMAIL: ${{ inputs.email }}
-  INPUT_NAME: ${{ inputs.name }}
+  INPUT_DEBEMAIL: ${{ inputs.debemail }}
+  INPUT_DEBNAME: ${{ inputs.debname }}
   INPUT_DIST: ${{ inputs.distribution }}
   INPUT_MESSAGE: ${{ inputs.message }}
   INPUT_BUILD_OPTIONS: ${{ inputs.build_options }}
@@ -86,8 +86,8 @@ jobs:
         id: build
         run: |
           pkg="$(podman run \
-               -e EMAIL='${{ env.INPUT_EMAIL }}' \
-               -e NAME='${{ env.INPUT_NAME }}' \
+               -e DEBEMAIL='${{ env.INPUT_DEBEMAIL }}' \
+               -e DEBNAME='${{ env.INPUT_DEBNAME }}' \
                -e DIST='${{ env.INPUT_DIST }}' \
                -e MESSAGE='${{ env.INPUT_MESSAGE }}' \
                -e BUILD_OPTIONS='${{ env.INPUT_BUILD_OPTIONS }}' \
@@ -169,8 +169,8 @@ jobs:
         run: |
           mkdir output
           pkg="$(podman run \
-               -e EMAIL='${{ env.INPUT_EMAIL }}' \
-               -e NAME='${{ env.INPUT_NAME }}' \
+               -e DEBEMAIL='${{ env.INPUT_DEBEMAIL }}' \
+               -e DEBNAME='${{ env.INPUT_DEBNAME }}' \
                -e DIST='${{ env.INPUT_DIST }}' \
                -e MESSAGE='${{ env.INPUT_MESSAGE }}' \
                -e BUILD_OPTIONS='${{ env.INPUT_BUILD_OPTIONS }}' \
diff --git a/container/bin/build_source b/container/bin/build_source
index 548df75..e41bdf9 100755
--- a/container/bin/build_source
+++ b/container/bin/build_source
@@ -109,7 +109,7 @@ apply_patches() (
 	[ -n "$version" ] || version="$(dpkg-parsechangelog --show-field Version)"
 	version_suffix="$VERSION_SUFFIX"
 
-	DEBEMAIL="$EMAIL" DEBFULLNAME="$NAME" dch --newversion "$version$version_suffix" --distribution "$DIST" --force-distribution -- "$MESSAGE"
+	dch --newversion "$version$version_suffix" --distribution "$DIST" --force-distribution -- "$MESSAGE"
 
 	if [ -x "$1/exec.post" ]; then
 		SOURCE="$source" "$1/exec.post"