From 0b2585a5cbbaa33be05ef3699b3585af9a35671e Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sun, 4 Jun 2017 20:15:37 -0600
Subject: [PATCH] Go back to using cargo run
---
cook.sh | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/cook.sh b/cook.sh
index 2432e9aff..7495999aa 100755
--- a/cook.sh
+++ b/cook.sh
@@ -195,20 +195,12 @@ function op {
rm -rfv stage
;;
tar)
- # Compile pkgutils if needed
- if [ ! -f "$ROOT/pkgutils/target/release/pkg" ]
- then
- pushd "$ROOT/pkgutils/" > /dev/null
- TARGET=x86_64-unknown-redox cargo build --release
- popd > /dev/null
- fi
-
echo "name = \"$1\"" > "stage.toml"
echo "version = \"$(op $1 version)\"" >> "stage.toml"
echo "target = \"$TARGET\"" >> "stage.toml"
mkdir -p stage/pkg
cp -v stage.toml "stage/pkg/$1.toml"
- "$ROOT/pkgutils/target/release/pkg" create stage
+ TARGET=x86_64-unknown-redox cargo run --release --manifest-path "$ROOT/pkgutils/Cargo.toml" --bin pkg -- create stage
;;
untar)
rm -rfv stage.tar stage.sig stage.toml
--
GitLab