.NET tool: split packaging script

Split pack-tool.sh into two scripts (layout.sh and pack.sh) to allow for
payload and package signing.

Author: Lessley Dennington

src/shared/DotnetTool/pack-tool.sh renamed to src/shared/DotnetTool/layout.sh

@@ -1,9 +1,4 @@
 #!/bin/bash
-die () {
-    echo "$*" >&2
-    exit 1
-}
-
 make_absolute () {
     case "$1" in
     /*)
@@ -26,20 +21,12 @@ case "$i" in
     CONFIGURATION="${i#*=}"
     shift # past argument=value
     ;;
-    --version=*)
-    VERSION="${i#*=}"
-    shift # past argument=value
-    ;;
     *)
           # unknown option
     ;;
 esac
 done
 
-if [ -z "$VERSION" ]; then
-    die "--version was not set"
-fi
-
 # Directories
 THISDIR="$( cd "$(dirname "$0")" ; pwd -P )"
 ROOT="$( cd "$THISDIR"/../../.. ; pwd -P )"
@@ -126,15 +113,3 @@ echo "Copying images..."
 cp "$SRC/$DOTNET_TOOL/icon.png" "$IMGOUT" || exit 1
 
 echo "Build complete."
-
-#####################################################################
-# Pack dotnet tool
-#####################################################################
-echo "Creating dotnet tool package..."
-
-dotnet pack "$SRC/$DOTNET_TOOL/DotnetTool.csproj" \
-    /p:Configuration="$CONFIGURATION" \
-    /p:PackageVersion="$VERSION" \
-    /p:PublishDir="$OUTDIR/"
-
-echo "Dotnet tool pack complete."

src/shared/DotnetTool/pack.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+die () {
+    echo "$*" >&2
+    exit 1
+}
+
+# Parse script arguments
+for i in "$@"
+do
+case "$i" in
+    --configuration=*)
+    CONFIGURATION="${i#*=}"
+    shift # past argument=value
+    ;;
+	--version=*)
+    VERSION="${i#*=}"
+    shift # past argument=value
+    ;;
+	--publish-dir=*)
+    PUBLISH_DIR="${i#*=}"
+    shift # past argument=value
+    ;;
+    *)
+          # unknown option
+    ;;
+esac
+done
+
+CONFIGURATION="${CONFIGURATION:=Debug}"
+if [ -z "$VERSION" ]; then
+    die "--version was not set"
+fi
+
+# Directories
+THISDIR="$( cd "$(dirname "$0")" ; pwd -P )"
+ROOT="$( cd "$THISDIR"/../../.. ; pwd -P )"
+SRC="$ROOT/src"
+OUT="$ROOT/out"
+DOTNET_TOOL="shared/DotnetTool"
+
+if [ -z "$PUBLISH_DIR" ]; then
+    PUBLISH_DIR="$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/"
+
+echo "Dotnet tool pack complete."