clean up jq calls, fix variable expansion

pull/164/head
Aaron Trudeau 2022-01-27 01:22:28 -05:00
parent f8810dc5cf
commit bcf9542234
No known key found for this signature in database
GPG Key ID: 29F89A9BDAAF7BDE
1 changed files with 5 additions and 16 deletions

View File

@ -47,8 +47,8 @@ if [ "$PACKAGE_MODE" = "true" ]; then
UNITY_PROJECT_PATH="./TempProject" UNITY_PROJECT_PATH="./TempProject"
# use jq to append the package name to the project's Packages/manifest.json file # use jq to add the package to the temp project through manually modifying Packages/manifest.json
echo "Adding package to project's Packages/manifest.json dependencies..." echo "Adding package to the temporary project's dependencies and testables..."
PACKAGE_MANIFEST_PATH="./TempProject/Packages/manifest.json" PACKAGE_MANIFEST_PATH="./TempProject/Packages/manifest.json"
if [ ! -f "$PACKAGE_MANIFEST_PATH" ]; then if [ ! -f "$PACKAGE_MANIFEST_PATH" ]; then
@ -58,20 +58,9 @@ if [ "$PACKAGE_MODE" = "true" ]; then
PACKAGE_MANIFEST_JSON=$(cat "$PACKAGE_MANIFEST_PATH") PACKAGE_MANIFEST_JSON=$(cat "$PACKAGE_MANIFEST_PATH")
echo "$PACKAGE_MANIFEST_JSON" | \ echo "$PACKAGE_MANIFEST_JSON" | \
jq --arg package_name $PACKAGE_NAME --arg project_path $UNITY_PROJECT_PATH \ jq --arg package_name "$PACKAGE_NAME" --arg project_path "$UNITY_PROJECT_PATH" \
'.dependencies += {"package_name": "file:$project_path"}' > "$PACKAGE_MANIFEST_PATH" '.dependencies += {"$package_name": "file:$project_path"} | . += {"testables": ["$package_name"]}' \
> "$PACKAGE_MANIFEST_PATH"
echo "Adding package to project's Packages/manifest.json testables..."
echo ""
PACKAGE_MANIFEST_JSON=$(cat "$PACKAGE_MANIFEST_PATH")
cat "$PACKAGE_MANIFEST_PATH"
echo ""
echo "$PACKAGE_MANIFEST_JSON" | \
jq --arg package_name $PACKAGE_NAME \
'. += {"testables": ["$package_name"]}' > "$PACKAGE_MANIFEST_PATH"
cat "$PACKAGE_MANIFEST_PATH" cat "$PACKAGE_MANIFEST_PATH"
echo "" echo ""