Migrate some WIP recipes to /usr

recipes/wip/ani-cli/recipe.toml

@@ -5,7 +5,7 @@ rev = "4a77bca5d95ae755ab5ac129c2db2025feab217b"
 [build]
 template = "custom"
 script = """
-mkdir -pv "${COOKBOOK_STAGE}"/bin
-cp "${COOKBOOK_SOURCE}"/ani-cli "${COOKBOOK_STAGE}"/bin/ani-cli
-chmod a+x "${COOKBOOK_STAGE}"/bin/ani-cli
+mkdir -pv "${COOKBOOK_STAGE}"/usr/bin
+cp "${COOKBOOK_SOURCE}"/ani-cli "${COOKBOOK_STAGE}"/usr/bin/ani-cli
+chmod a+x "${COOKBOOK_STAGE}"/usr/bin/ani-cli
 """

recipes/wip/ani-skip/recipe.toml

@@ -4,9 +4,9 @@ git = "https://github.com/synacktraa/ani-skip"
 [build]
 template = "custom"
 script = """
-mkdir -pv "${COOKBOOK_STAGE}"/bin
+mkdir -pv "${COOKBOOK_STAGE}"/usr/bin
 mkdir -pv "${COOKBOOK_STAGE}"/home/user/.config/mpv/scripts
-cp "${COOKBOOK_SOURCE}"/ani-skip "${COOKBOOK_STAGE}"/bin/ani-skip
+cp "${COOKBOOK_SOURCE}"/ani-skip "${COOKBOOK_STAGE}"/usr/bin/ani-skip
 cp "${COOKBOOK_SOURCE}"/skip.lua "${COOKBOOK_STAGE}"/home/user/.config/mpv/scripts
-chmod a+x "${COOKBOOK_STAGE}"/bin/ani-skip
+chmod a+x "${COOKBOOK_STAGE}"/usr/bin/ani-skip
 """

recipes/wip/dra-cla/recipe.toml

@@ -4,7 +4,7 @@ git = "https://github.com/CoolnsX/dra-cla"
 [build]
 template = "custom"
 script = """
-mkdir -pv "${COOKBOOK_STAGE}"/bin
-cp "${COOKBOOK_SOURCE}"/dra-cla "${COOKBOOK_STAGE}"/bin/dra-cla
-chmod a+x "${COOKBOOK_STAGE}"/bin/dra-cla
+mkdir -pv "${COOKBOOK_STAGE}"/usr/bin
+cp "${COOKBOOK_SOURCE}"/dra-cla "${COOKBOOK_STAGE}"/usr/bin/dra-cla
+chmod a+x "${COOKBOOK_STAGE}"/usr/bin/dra-cla
 """

recipes/wip/hickory-dns/recipe.toml

@@ -14,8 +14,8 @@ binary=hickory-dns
             --bin "${binary}" \
             --release
             --all-features
-        mkdir -pv "${COOKBOOK_STAGE}/bin"
+        mkdir -pv "${COOKBOOK_STAGE}/usr/bin"
         cp -v \
             "target/${TARGET}/release/${binary}" \
-            "${COOKBOOK_STAGE}/bin/${binary}"
+            "${COOKBOOK_STAGE}/usr/bin/${binary}"
 """

recipes/wip/humphrey/recipe.toml

-#TODO wrong script
+#TODO not compiled or tested
 [source]
 git = "https://github.com/w-henderson/Humphrey"
 [build]
 template = "custom"
 script = """
-package="humphrey_server"
+binary=humphrey_server
 "${COOKBOOK_CARGO}" build \
             --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
-            --package "${package}" \
+            --bin "${binary}" \
             --release
-           --all-features
-        mkdir -pv "${COOKBOOK_STAGE}/bin"
+            --all-features
+        mkdir -pv "${COOKBOOK_STAGE}/usr/bin"
         cp -v \
-            "target/${TARGET}/release/${package}" \
-            "${COOKBOOK_STAGE}/bin/${package}"
+            "target/${TARGET}/release/${binary}" \
+            "${COOKBOOK_STAGE}/usr/bin/${binary}"
 """

recipes/wip/intermodal/recipe.toml

@@ -5,5 +5,5 @@ git = "https://github.com/casey/intermodal"
 template = "custom"
 script = """
 cookbook_cargo
-mv "${COOKBOOK_STAGE}/bin/imdl" "${COOKBOOK_STAGE}/bin/intermodal"
+mv "${COOKBOOK_STAGE}/usr/bin/imdl" "${COOKBOOK_STAGE}/usr/bin/intermodal"
 """

recipes/wip/jerry/recipe.toml

@@ -4,7 +4,7 @@ git = "https://github.com/justchokingaround/jerry"
 [build]
 template = "custom"
 script = """
-mkdir -pv "${COOKBOOK_STAGE}"/bin
-cp "${COOKBOOK_SOURCE}"/jerry.sh "${COOKBOOK_STAGE}"/bin/jerry
-chmod a+x "${COOKBOOK_STAGE}"/bin/jerry
+mkdir -pv "${COOKBOOK_STAGE}"/usr/bin
+cp "${COOKBOOK_SOURCE}"/jerry.sh "${COOKBOOK_STAGE}"/usr/bin/jerry
+chmod a+x "${COOKBOOK_STAGE}"/usr/bin/jerry
 """

recipes/wip/lobster/recipe.toml

@@ -4,7 +4,7 @@ git = "https://github.com/justchokingaround/lobster"
 [build]
 template = "custom"
 script = """
-mkdir -pv "${COOKBOOK_STAGE}"/bin
-cp "${COOKBOOK_SOURCE}"/lobster.sh "${COOKBOOK_STAGE}"/bin/lobster
-chmod a+x "${COOKBOOK_STAGE}"/bin/lobster
+mkdir -pv "${COOKBOOK_STAGE}"/usr/bin
+cp "${COOKBOOK_SOURCE}"/lobster.sh "${COOKBOOK_STAGE}"/usr/bin/lobster
+chmod a+x "${COOKBOOK_STAGE}"/usr/bin/lobster
 """

recipes/wip/lsix/recipe.toml

@@ -4,11 +4,7 @@ git = "https://github.com/hackerb9/lsix"
 [build]
 template = "custom"
 script = """
-mkdir -pv "${COOKBOOK_STAGE}"/bin
-cp "${COOKBOOK_SOURCE}"/lsix "${COOKBOOK_STAGE}"/bin/lsix
-chmod a+x "${COOKBOOK_STAGE}"/bin/lsix
+mkdir -pv "${COOKBOOK_STAGE}"/usr/bin
+cp "${COOKBOOK_SOURCE}"/lsix "${COOKBOOK_STAGE}"/usr/bin/lsix
+chmod a+x "${COOKBOOK_STAGE}"/usr/bin/lsix
 """
-[package]
-dependencies = [
-    "imagemagick7",
-]

recipes/wip/neofetch/recipe.toml

@@ -5,7 +5,7 @@ rev = "60d07dee6b76769d8c487a40639fb7b5a1a7bc85"
 [build]
 template = "custom"
 script = """
-mkdir -pv "${COOKBOOK_STAGE}"/bin
-cp "${COOKBOOK_SOURCE}"/neofetch "${COOKBOOK_STAGE}"/bin/neofetch
-chmod a+x "${COOKBOOK_STAGE}"/bin/neofetch
+mkdir -pv "${COOKBOOK_STAGE}"/usr/bin
+cp "${COOKBOOK_SOURCE}"/neofetch "${COOKBOOK_STAGE}"/usr/bin/neofetch
+chmod a+x "${COOKBOOK_STAGE}"/usr/bin/neofetch
 """

recipes/wip/niri/recipe.toml

@@ -8,10 +8,10 @@ dependencies = [
     "libwayland",
 ]
 script = """
-mkdir -pv "${COOKBOOK_STAGE}"/bin
+mkdir -pv "${COOKBOOK_STAGE}"/usr/bin
 mkdir -pv "${COOKBOOK_STAGE}"/home/user/.local/share/wayland-sessions
 mkdir -pv "${COOKBOOK_STAGE}"/home/user/.local/share/xdg-desktop-portal
-cp -rv "${COOKBOOK_SOURCE}"/resources/niri-session "${COOKBOOK_STAGE}"/bin
+cp -rv "${COOKBOOK_SOURCE}"/resources/niri-session "${COOKBOOK_STAGE}"/usr/bin
 cp -rv "${COOKBOOK_SOURCE}"/resources/niri.desktop "${COOKBOOK_STAGE}"/home/user/.local/share/wayland-sessions
 cp -rv "${COOKBOOK_SOURCE}"/resources/niri-portals.conf "${COOKBOOK_STAGE}"/home/user/.local/share/xdg-desktop-portal
 cookbook_cargo

recipes/wip/symphonia-play/recipe.toml

@@ -6,5 +6,5 @@ git = "https://github.com/pdeljanov/Symphonia"
 template = "custom"
 script = """
 cookbook_cargo_packages symphonia-play
-mv "${COOKBOOK_STAGE}/bin/symphonia-play_symphonia-play" "${COOKBOOK_STAGE}/bin/symphonia-play"
+mv "${COOKBOOK_STAGE}/usr/bin/symphonia-play_symphonia-play" "${COOKBOOK_STAGE}/usr/bin/symphonia-play"
 """