dotnettool/{pack,layout}.sh: allow specification of dirs

Allow a caller of pack.sh and layout.sh to specify the location of the
package root and output.

Signed-off-by: Matthew John Cheetham <mjcheetham@outlook.com>

Author: mjcheetham

.github/workflows/release.yml

@@ -401,7 +401,7 @@ jobs:
       run: |
         src/shared/DotnetTool/pack.sh --configuration=Release \
           --version="${{ needs.prereqs.outputs.version }}" \
-          --publish-dir=$(pwd)/signed
+          --package-root=$(pwd)/signed
 
     - name: Upload unsigned package
       uses: actions/upload-artifact@v4

src/shared/DotnetTool/layout.sh

@@ -21,6 +21,10 @@ case "$i" in
     CONFIGURATION="${i#*=}"
     shift # past argument=value
     ;;
+    --output=*)
+    OUTDIR="${i#*=}"
+    shift # past argument=value
+    ;;
     *)
           # unknown option
     ;;
@@ -42,7 +46,9 @@ CONFIGURATION="${CONFIGURATION:=Debug}"
 FRAMEWORK=net8.0
 
 # Outputs
-OUTDIR="$PROJ_OUT/nupkg/$CONFIGURATION"
+if [ -z "$OUTDIR" ]; then
+    OUTDIR="$PROJ_OUT/nupkg/$CONFIGURATION"
+fi
 IMGOUT="$OUTDIR/images"
 PAYLOAD="$OUTDIR/payload"
 SYMBOLOUT="$OUTDIR/payload.sym"

src/shared/DotnetTool/pack.sh

@@ -12,12 +12,16 @@ case "$i" in
     CONFIGURATION="${i#*=}"
     shift # past argument=value
     ;;
-	--version=*)
+    --version=*)
     VERSION="${i#*=}"
     shift # past argument=value
     ;;
-	--publish-dir=*)
-    PUBLISH_DIR="${i#*=}"
+    --package-root=*)
+    PACKAGE_ROOT="${i#*=}"
+    shift # past argument=value
+    ;;
+    --output=*)
+    OUTPUT="${i#*=}"
     shift # past argument=value
     ;;
     *)
@@ -38,15 +42,23 @@ SRC="$ROOT/src"
 OUT="$ROOT/out"
 DOTNET_TOOL="shared/DotnetTool"
 
-if [ -z "$PUBLISH_DIR" ]; then
-    PUBLISH_DIR="$OUT/$DOTNET_TOOL/nupkg/$CONFIGURATION"
+if [ -z "$PACKAGE_ROOT" ]; then
+    PACKAGE_ROOT="$OUT/$DOTNET_TOOL/nupkg/$CONFIGURATION"
 fi
 
 echo "Creating dotnet tool package..."
 
-dotnet pack "$SRC/$DOTNET_TOOL/DotnetTool.csproj" \
-    /p:Configuration="$CONFIGURATION" \
-    /p:PackageVersion="$VERSION" \
-    /p:PublishDir="$PUBLISH_DIR/"
+if [ -z "$OUTPUT" ]; then
+    dotnet pack "$SRC/$DOTNET_TOOL/DotnetTool.csproj" \
+        /p:Configuration="$CONFIGURATION" \
+        /p:PackageVersion="$VERSION" \
+        /p:PublishDir="$PACKAGE_ROOT/"
+else
+    dotnet pack "$SRC/$DOTNET_TOOL/DotnetTool.csproj" \
+        /p:Configuration="$CONFIGURATION" \
+        /p:PackageVersion="$VERSION" \
+        /p:PublishDir="$PACKAGE_ROOT/" \
+        --output "$OUTPUT"
+fi
 
 echo "Dotnet tool pack complete."