From 7cb4b95b0301c9984bf433af2d1e3bfb8922058d Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 18 May 2023 13:17:46 -0600
Subject: [PATCH] Simplify cargo recipes

---
 recipes/findutils/recipe.toml |  5 +----
 recipes/iced/recipe.toml      | 14 +-------------
 recipes/libcosmic/recipe.toml |  8 +-------
 recipes/orbterm/recipe.toml   |  7 +------
 recipes/orbutils/recipe.toml  | 28 ++++++----------------------
 recipes/redoxerd/recipe.toml  |  5 +----
 recipes/uutils/recipe.toml    |  7 +------
 src/bin/cook.rs               | 13 ++++++-------
 8 files changed, 18 insertions(+), 69 deletions(-)

diff --git a/recipes/findutils/recipe.toml b/recipes/findutils/recipe.toml
index 65ec7db45..4da7c2cb7 100644
--- a/recipes/findutils/recipe.toml
+++ b/recipes/findutils/recipe.toml
@@ -4,8 +4,5 @@ git = "https://gitlab.redox-os.org/redox-os/findutils.git"
 [build]
 template = "custom"
 script = """
-COOKBOOK_CARGO_FLAGS+=(
-    --bin find
-)
-cookbook_cargo
+cookbook_cargo --bin find
 """
diff --git a/recipes/iced/recipe.toml b/recipes/iced/recipe.toml
index 447f93d5f..ae7dc4f18 100644
--- a/recipes/iced/recipe.toml
+++ b/recipes/iced/recipe.toml
@@ -5,17 +5,5 @@ branch = "redox"
 [build]
 template = "custom"
 script = """
-EXAMPLES=(
-    styling
-)
-set -x
-for example in "${EXAMPLES[@]}"
-do
-    ${COOKBOOK_CARGO} build \
-        --release \
-        --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
-        --package "${example}"
-    mkdir -pv "${COOKBOOK_STAGE}/bin"
-    cp -v "target/${TARGET}/release/${example}" "${COOKBOOK_STAGE}/bin/iced_${example}"
-done
+cookbook_cargo_packages styling
 """
diff --git a/recipes/libcosmic/recipe.toml b/recipes/libcosmic/recipe.toml
index 3832b9f98..cd89c2f61 100644
--- a/recipes/libcosmic/recipe.toml
+++ b/recipes/libcosmic/recipe.toml
@@ -5,11 +5,5 @@ branch = "redox"
 [build]
 template = "custom"
 script = """
-    set -x
-    ${COOKBOOK_CARGO} build \
-        --release \
-        --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
-        --package cosmic
-    mkdir -pv "${COOKBOOK_STAGE}/bin"
-    cp -v "target/${TARGET}/release/cosmic" "${COOKBOOK_STAGE}/bin/libcosmic"
+cookbook_cargo_packages cosmic
 """
diff --git a/recipes/orbterm/recipe.toml b/recipes/orbterm/recipe.toml
index 869254582..2d247c14a 100644
--- a/recipes/orbterm/recipe.toml
+++ b/recipes/orbterm/recipe.toml
@@ -4,12 +4,7 @@ git = "https://gitlab.redox-os.org/redox-os/orbterm.git"
 [build]
 template = "custom"
 script = """
-COOKBOOK_CARGO_FLAGS=(
-    --path "${COOKBOOK_SOURCE}"
-    --root "${COOKBOOK_STAGE}/ui"
-    --locked
-    --no-track
-)
+COOKBOOK_STAGE="${COOKBOOK_STAGE}/ui"
 cookbook_cargo
 """
 
diff --git a/recipes/orbutils/recipe.toml b/recipes/orbutils/recipe.toml
index 920ed576d..b38bb8302 100644
--- a/recipes/orbutils/recipe.toml
+++ b/recipes/orbutils/recipe.toml
@@ -4,28 +4,12 @@ git = "https://gitlab.redox-os.org/redox-os/orbutils.git"
 [build]
 template = "custom"
 script = """
-COOKBOOK_CARGO_FLAGS=(
-    --path "${COOKBOOK_SOURCE}/orbutils"
-    --root "${COOKBOOK_STAGE}/ui"
-    --locked
-    --no-track
-)
+COOKBOOK_STAGE="${COOKBOOK_STAGE}/ui"
+ORIGINAL_SOURCE="${COOKBOOK_SOURCE}"
+
+COOKBOOK_SOURCE="${ORIGINAL_SOURCE}/orbutils"
 cookbook_cargo
-COOKBOOK_CARGO_FLAGS=(
-    --path "${COOKBOOK_SOURCE}/calculator"
-    --root "${COOKBOOK_STAGE}/ui"
-    --locked
-    --no-track
-)
+
+COOKBOOK_SOURCE="${ORIGINAL_SOURCE}/calculator"
 cookbook_cargo
 """
-
-[package]
-dependencies = [
-    "orbital",
-    "expat",
-    "fontconfig",
-    "freetype",
-    "libpng",
-    "zlib",
-]
diff --git a/recipes/redoxerd/recipe.toml b/recipes/redoxerd/recipe.toml
index 16d4a5a7f..8a49ef48b 100644
--- a/recipes/redoxerd/recipe.toml
+++ b/recipes/redoxerd/recipe.toml
@@ -4,9 +4,6 @@ git = "https://gitlab.redox-os.org/redox-os/redoxer.git"
 [build]
 template = "custom"
 script = """
-COOKBOOK_CARGO_FLAGS=(
-    --path "${COOKBOOK_SOURCE}/daemon"
-    --root "${COOKBOOK_STAGE}"
-)
+COOKBOOK_SOURCE="${COOKBOOK_SOURCE}/daemon"
 cookbook_cargo
 """
diff --git a/recipes/uutils/recipe.toml b/recipes/uutils/recipe.toml
index e346a12bf..c04c57187 100644
--- a/recipes/uutils/recipe.toml
+++ b/recipes/uutils/recipe.toml
@@ -5,12 +5,7 @@ branch = "redox"
 [build]
 template = "custom"
 script = """
-COOKBOOK_CARGO_FLAGS+=(
-    --no-default-features
-    --features feat_os_unix_redox
-    --bin coreutils
-)
-cookbook_cargo
+cookbook_cargo --no-default-features --features feat_os_unix_redox --bin coreutils
 
 BINS=(
     base32
diff --git a/src/bin/cook.rs b/src/bin/cook.rs
index b055920b6..9fe35867b 100644
--- a/src/bin/cook.rs
+++ b/src/bin/cook.rs
@@ -461,14 +461,13 @@ export PKG_CONFIG_SYSROOT_DIR="${COOKBOOK_SYSROOT}"
 
 # cargo template
 COOKBOOK_CARGO="${COOKBOOK_REDOXER}"
-COOKBOOK_CARGO_FLAGS=(
-    --path "${COOKBOOK_SOURCE}"
-    --root "${COOKBOOK_STAGE}"
-    --locked
-    --no-track
-)
 function cookbook_cargo {
-    "${COOKBOOK_CARGO}" install "${COOKBOOK_CARGO_FLAGS[@]}"
+    "${COOKBOOK_CARGO}" install \
+        --path "${COOKBOOK_SOURCE}" \
+        --root "${COOKBOOK_STAGE}" \
+        --locked \
+        --no-track \
+        "$@"
 }
 
 # helper for installing binaries that are cargo examples
-- 
GitLab