Skip to content
Snippets Groups Projects
Commit 0199ab85 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Merge branch 'orbital-bins' into 'master'

correct install path for orbutils and orbterm

See merge request !341
parents a19a406e 30b01b43
No related branches found
No related tags found
1 merge request!341correct install path for orbutils and orbterm
...@@ -4,8 +4,12 @@ git = "https://gitlab.redox-os.org/redox-os/orbterm.git" ...@@ -4,8 +4,12 @@ git = "https://gitlab.redox-os.org/redox-os/orbterm.git"
[build] [build]
template = "custom" template = "custom"
script = """ script = """
COOKBOOK_STAGE="${COOKBOOK_STAGE}/ui" "${COOKBOOK_CARGO}" install \
cookbook_cargo --path "${COOKBOOK_SOURCE}" \
--root "${COOKBOOK_STAGE}/ui" \
--locked \
--no-track \
${install_flags}
""" """
[package] [package]
......
...@@ -4,12 +4,21 @@ git = "https://gitlab.redox-os.org/redox-os/orbutils.git" ...@@ -4,12 +4,21 @@ git = "https://gitlab.redox-os.org/redox-os/orbutils.git"
[build] [build]
template = "custom" template = "custom"
script = """ script = """
COOKBOOK_STAGE="${COOKBOOK_STAGE}/ui"
ORIGINAL_SOURCE="${COOKBOOK_SOURCE}" ORIGINAL_SOURCE="${COOKBOOK_SOURCE}"
COOKBOOK_SOURCE="${ORIGINAL_SOURCE}/orbutils" COOKBOOK_SOURCE="${ORIGINAL_SOURCE}/orbutils"
cookbook_cargo "${COOKBOOK_CARGO}" install \
--path "${COOKBOOK_SOURCE}" \
--root "${COOKBOOK_STAGE}/ui" \
--locked \
--no-track \
${install_flags}
COOKBOOK_SOURCE="${ORIGINAL_SOURCE}/calculator" COOKBOOK_SOURCE="${ORIGINAL_SOURCE}/calculator"
cookbook_cargo "${COOKBOOK_CARGO}" install \
--path "${COOKBOOK_SOURCE}" \
--root "${COOKBOOK_STAGE}/ui" \
--locked \
--no-track \
${install_flags}
""" """
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment