From 3d5280df401669203d56c60e154213d23d613311 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 18 Jan 2024 14:05:58 -0700
Subject: [PATCH] orbterm,orbutils: move binaries to /usr/bin
---
recipes/gui/orbterm/recipe.toml | 2 +-
recipes/gui/orbutils-background/recipe.sh | 2 +-
recipes/gui/orbutils-launcher/recipe.sh | 2 +-
recipes/gui/orbutils-orblogin/recipe.sh | 2 +-
recipes/gui/orbutils/recipe.toml | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/recipes/gui/orbterm/recipe.toml b/recipes/gui/orbterm/recipe.toml
index 84aefb2d9..d2f1e3fd7 100644
--- a/recipes/gui/orbterm/recipe.toml
+++ b/recipes/gui/orbterm/recipe.toml
@@ -6,7 +6,7 @@ template = "custom"
script = """
"${COOKBOOK_CARGO}" install \
--path "${COOKBOOK_SOURCE}" \
- --root "${COOKBOOK_STAGE}/ui" \
+ --root "${COOKBOOK_STAGE}/usr" \
--locked \
--no-track \
${install_flags}
diff --git a/recipes/gui/orbutils-background/recipe.sh b/recipes/gui/orbutils-background/recipe.sh
index bf281add0..237d8b020 100644
--- a/recipes/gui/orbutils-background/recipe.sh
+++ b/recipes/gui/orbutils-background/recipe.sh
@@ -1,4 +1,4 @@
GIT=https://gitlab.redox-os.org/redox-os/orbutils.git
-BINDIR=/ui/bin
+BINDIR=/usr/bin
CARGOFLAGS="--bin background -p orbutils"
DEPENDS="orbital"
diff --git a/recipes/gui/orbutils-launcher/recipe.sh b/recipes/gui/orbutils-launcher/recipe.sh
index daf6a4f08..4b4975b50 100644
--- a/recipes/gui/orbutils-launcher/recipe.sh
+++ b/recipes/gui/orbutils-launcher/recipe.sh
@@ -1,4 +1,4 @@
GIT=https://gitlab.redox-os.org/redox-os/orbutils.git
-BINDIR=/ui/bin
+BINDIR=/usr/bin
CARGOFLAGS="--bin launcher -p orbutils"
DEPENDS="orbital"
diff --git a/recipes/gui/orbutils-orblogin/recipe.sh b/recipes/gui/orbutils-orblogin/recipe.sh
index a1aae4641..a7dd5f536 100644
--- a/recipes/gui/orbutils-orblogin/recipe.sh
+++ b/recipes/gui/orbutils-orblogin/recipe.sh
@@ -1,4 +1,4 @@
GIT=https://gitlab.redox-os.org/redox-os/orbutils.git
-BINDIR=/ui/bin
+BINDIR=/usr/bin
CARGOFLAGS="--bin orblogin -p orbutils"
DEPENDS="orbital"
diff --git a/recipes/gui/orbutils/recipe.toml b/recipes/gui/orbutils/recipe.toml
index 9e36357db..f284dea2a 100644
--- a/recipes/gui/orbutils/recipe.toml
+++ b/recipes/gui/orbutils/recipe.toml
@@ -9,7 +9,7 @@ ORIGINAL_SOURCE="${COOKBOOK_SOURCE}"
COOKBOOK_SOURCE="${ORIGINAL_SOURCE}/orbutils"
"${COOKBOOK_CARGO}" install \
--path "${COOKBOOK_SOURCE}" \
- --root "${COOKBOOK_STAGE}/ui" \
+ --root "${COOKBOOK_STAGE}/usr" \
--locked \
--no-track \
${install_flags}
@@ -17,7 +17,7 @@ COOKBOOK_SOURCE="${ORIGINAL_SOURCE}/orbutils"
COOKBOOK_SOURCE="${ORIGINAL_SOURCE}/calculator"
"${COOKBOOK_CARGO}" install \
--path "${COOKBOOK_SOURCE}" \
- --root "${COOKBOOK_STAGE}/ui" \
+ --root "${COOKBOOK_STAGE}/usr" \
--locked \
--no-track \
${install_flags}
--
GitLab