From 93bb93f429a861a986f5708bc376f9b8a48e5da3 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Mon, 8 Jan 2024 21:05:12 +0100
Subject: [PATCH 1/5] Remove setup.sh

It isn't used anywhere
---
 setup.sh | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100755 setup.sh

diff --git a/setup.sh b/setup.sh
deleted file mode 100755
index 25b6377a3..000000000
--- a/setup.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-echo "Downloading latest pkgutils"
-git submodule update --init --remote pkgutils
-cargo update --manifest-path pkgutils/Cargo.toml
-
-echo "Defaulting to rust nightly"
-rustup override set nightly
-echo "Update rust nightly"
-rustup update nightly
-echo "Downloading rust source"
-rustup component add rust-src
-if [ -z "$(which cargo-config)" ]
-then
-    echo "Installing cargo-config"
-    cargo install -f cargo-config
-fi
-
-echo "cook.sh is ready to use"

From 8209fa04c92c26f7a094e582b26c788b95c4b85d Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Mon, 8 Jan 2024 21:26:24 +0100
Subject: [PATCH 2/5] Convert fal recipe to toml and move to wip

---
 recipes/dev/fal/recipe.sh   | 2 --
 recipes/wip/fal/recipe.toml | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 delete mode 100644 recipes/dev/fal/recipe.sh
 create mode 100644 recipes/wip/fal/recipe.toml

diff --git a/recipes/dev/fal/recipe.sh b/recipes/dev/fal/recipe.sh
deleted file mode 100644
index 8e102368f..000000000
--- a/recipes/dev/fal/recipe.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-GIT=https://github.com/4lDO2/fal-rs
-CARGO_PACKAGE=fal-frontend-redox
diff --git a/recipes/wip/fal/recipe.toml b/recipes/wip/fal/recipe.toml
new file mode 100644
index 000000000..c8e48a478
--- /dev/null
+++ b/recipes/wip/fal/recipe.toml
@@ -0,0 +1,6 @@
+[source]
+git = "https://github.com/4lDO2/fal-rs"
+
+[build]
+template = "custom"
+script = "cookbook_cargo_packages fal-frontend-redox"

From adaf1c9631174a21f12413019876541906f0f0e2 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Mon, 8 Jan 2024 21:33:55 +0100
Subject: [PATCH 3/5] Convert lci recipe to toml

---
 recipes/dev/lci/recipe.sh   | 1 -
 recipes/dev/lci/recipe.toml | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 delete mode 100644 recipes/dev/lci/recipe.sh
 create mode 100644 recipes/dev/lci/recipe.toml

diff --git a/recipes/dev/lci/recipe.sh b/recipes/dev/lci/recipe.sh
deleted file mode 100644
index c1c88b909..000000000
--- a/recipes/dev/lci/recipe.sh
+++ /dev/null
@@ -1 +0,0 @@
-GIT=https://github.com/jD91mZM2/rust-lci
diff --git a/recipes/dev/lci/recipe.toml b/recipes/dev/lci/recipe.toml
new file mode 100644
index 000000000..2f5e1cf44
--- /dev/null
+++ b/recipes/dev/lci/recipe.toml
@@ -0,0 +1,5 @@
+[source]
+git = "https://github.com/jD91mZM2/rust-lci"
+
+[build]
+template = "cargo"

From 6b90326bca390329ab89164b622cd9ad714a9fcb Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Mon, 8 Jan 2024 21:45:59 +0100
Subject: [PATCH 4/5] Make sure to install recipes using the cargo template get
 installed in /usr/bin too

---
 src/bin/cook.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/cook.rs b/src/bin/cook.rs
index 2badc3516..c6983d6e7 100644
--- a/src/bin/cook.rs
+++ b/src/bin/cook.rs
@@ -449,7 +449,7 @@ COOKBOOK_CARGO="${COOKBOOK_REDOXER}"
 function cookbook_cargo {
     "${COOKBOOK_CARGO}" install \
         --path "${COOKBOOK_SOURCE}" \
-        --root "${COOKBOOK_STAGE}" \
+        --root "${COOKBOOK_STAGE}/usr" \
         --locked \
         --no-track \
         "$@"

From a2ec53a47a382435b6e977fef5ced7a14b0f0efd Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Mon, 8 Jan 2024 21:57:37 +0100
Subject: [PATCH 5/5] Convert sodium recipe to toml

---
 recipes/tools/sodium/recipe.sh   | 10 ----------
 recipes/tools/sodium/recipe.toml | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 10 deletions(-)
 delete mode 100644 recipes/tools/sodium/recipe.sh
 create mode 100644 recipes/tools/sodium/recipe.toml

diff --git a/recipes/tools/sodium/recipe.sh b/recipes/tools/sodium/recipe.sh
deleted file mode 100644
index 5572b9ae2..000000000
--- a/recipes/tools/sodium/recipe.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-GIT=https://gitlab.redox-os.org/redox-os/sodium.git
-BINDIR="/ui/bin"
-CARGOFLAGS="--features orbital"
-
-function recipe_stage {
-    mkdir -pv "$1/ui/apps"
-    cp -v manifest "$1/ui/apps/sodium"
-    mkdir -pv "$1/ui/icons"
-    cp -v icon.png "$1/ui/icons/sodium.png"
-}
diff --git a/recipes/tools/sodium/recipe.toml b/recipes/tools/sodium/recipe.toml
new file mode 100644
index 000000000..5986392b0
--- /dev/null
+++ b/recipes/tools/sodium/recipe.toml
@@ -0,0 +1,18 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/sodium.git"
+
+[build]
+template = "custom"
+script = """
+"${COOKBOOK_CARGO}" install \
+    --path "${COOKBOOK_SOURCE}" \
+    --root "${COOKBOOK_STAGE}/ui" \
+    --locked \
+    --no-track \
+    --features orbital
+
+mkdir -pv "${COOKBOOK_STAGE}/ui/apps"
+cp -v ${COOKBOOK_SOURCE}/manifest "${COOKBOOK_STAGE}/ui/apps/sodium"
+mkdir -pv "${COOKBOOK_STAGE}/ui/icons"
+cp -v ${COOKBOOK_SOURCE}/icon.png "${COOKBOOK_STAGE}/ui/icons/sodium.png"
+"""