From 7667271ab169dd9dcc171f5b0541b1007965a704 Mon Sep 17 00:00:00 2001
From: Kody Low <kodylow7@gmail.com>
Date: Mon, 8 Jul 2024 15:53:37 -0700
Subject: [PATCH] fix: update yq command in makefile

---
 Dockerfile    |  2 +-
 Makefile      | 10 ++++++++--
 manifest.yaml |  7 +++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6bebc41..21e488a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Build gatewayd
-FROM fedimint/gatewayd:v0.3.0 AS gatewayd
+FROM fedimint/gatewayd:v0.3.1 AS gatewayd
 
 # Set environment variables for gatewayd
 ENV FM_GATEWAY_DATA_DIR=/gateway_data
diff --git a/Makefile b/Makefile
index 705d0fb..2680ddd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-PKG_ID := $(shell yq e ".id" manifest.yaml)
-PKG_VERSION := $(shell yq e ".version" manifest.yaml)
+PKG_ID := $(shell yq -r '.id' manifest.yaml)
+PKG_VERSION := $(shell yq -r '.version' manifest.yaml)
 TS_FILES := $(shell find ./ -name \*.ts)
 ASSET_PATHS := $(shell find ./assets/compat/*)
 
@@ -8,6 +8,12 @@ ASSET_PATHS := $(shell find ./assets/compat/*)
 
 all: verify
 
+debug-id:
+	@echo "ID:" $(shell yq e '.id' manifest.yaml)
+
+debug-version:
+	@echo "Version:" $(shell yq e '.version' manifest.yaml)
+
 verify: $(PKG_ID).s9pk
 	@start-sdk verify s9pk $(PKG_ID).s9pk
 	@echo " Done!"
diff --git a/manifest.yaml b/manifest.yaml
index f6af2f2..70d1967 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -1,14 +1,13 @@
 # Example written in yaml (toml and json are also acceptable)
 
 # The package identifier used by the OS. This must be unique amongst all other known packages
-id:
-  fedimint-gateway
-  # A human readable service title
+id: fedimint-gateway
+# A human readable service title
 title: "Gateway"
 # Service version - accepts up to four digits, where the last confirms to revisions necessary for StartOS - see documentation: https://github.com/Start9Labs/emver-rs. This value will change with each release of the service.
 version: 0.3.1
 # Release notes for the update - can be a string, paragraph or URL
-release-notes: {}
+release-notes: "Initial release for Fedimint Gateway"
 # The type of license for the project. Include the LICENSE in the root of the project directory. A license is required for a Start9 package.
 license: MIT
 # The repository URL for the package. This repo contains the manifest file (this), any scripts necessary for configuration, backups, actions, or health checks (more below). This key must exist. But could be embedded into the source repository.