Merge branch 'script_cleanup' into 'master'

Couple of small improvements

See merge request redox-os/cookbook!337

recipes/dev/fal/recipe.sh

@@ -1,2 +0,0 @@
-GIT=https://github.com/4lDO2/fal-rs
-CARGO_PACKAGE=fal-frontend-redox

recipes/dev/lci/recipe.sh

@@ -1 +0,0 @@
-GIT=https://github.com/jD91mZM2/rust-lci

recipes/dev/lci/recipe.toml

@@ -0,0 +1,5 @@
+[source]
+git = "https://github.com/jD91mZM2/rust-lci"
+
+[build]
+template = "cargo"

recipes/tools/sodium/recipe.sh

@@ -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"
-}

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"
+"""

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"

setup.sh

@@ -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"

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 \
         "$@"