From 9930e92fc7e7bf9854a262efd86908c098687dd7 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Mon, 27 Mar 2017 21:22:46 -0600
Subject: [PATCH] Change info to version number, echo to stderr
---
cook.sh | 10 +++++-----
recipes/orbdata/recipe.sh | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cook.sh b/cook.sh
index a310cbc29..bc3f41456 100755
--- a/cook.sh
+++ b/cook.sh
@@ -15,7 +15,7 @@ export CARGOFLAGS=
set -e
function op {
- echo -e "\033[01;38;5;215mcook - $1 $2\033[0m"
+ echo -e "\033[01;38;5;215mcook - $1 $2\033[0m" >&2
case "$2" in
dist)
op $1 fetch
@@ -44,16 +44,16 @@ function op {
unfetch)
rm -rfv build
;;
- info)
+ version)
pushd build > /dev/null
skip="0"
- if [ "$(type -t recipe_info)" = "function" ]
+ if [ "$(type -t recipe_version)" = "function" ]
then
- recipe_info || skip="1"
+ recipe_version || skip="1"
fi
if [ "$skip" -eq "0" ]
then
- echo "$1_$(cargo config package.version | tr -d '"')"
+ cargo config package.version | tr -d '"'
fi
popd > /dev/null
;;
diff --git a/recipes/orbdata/recipe.sh b/recipes/orbdata/recipe.sh
index ed2b4c208..77212e17f 100644
--- a/recipes/orbdata/recipe.sh
+++ b/recipes/orbdata/recipe.sh
@@ -1,7 +1,7 @@
GIT=https://github.com/redox-os/orbdata.git
-function recipe_info {
- echo "orbdata_0.0.1"
+function recipe_version {
+ echo "0.0.1"
return 1
}
--
GitLab