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

Convert to force cargo version, allow override in recipe

parent 3536471c
No related branches found
No related tags found
No related merge requests found
......@@ -46,13 +46,15 @@ function op {
;;
info)
pushd build > /dev/null
if [ -e Cargo.toml ]
skip="0"
if [ "$(type -t recipe_info)" = "function" ]
then
recipe_info || skip="1"
fi
if [ "$skip" -eq "0" ]
then
package_version="$(cargo config package.version | tr -d '"')"
else
package_version="$(git rev-parse --short HEAD)"
echo "$1_$(cargo config package.version | tr -d '"')"
fi
echo "$1_${package_version}"
popd > /dev/null
;;
update)
......
GIT=https://github.com/redox-os/orbdata.git
function recipe_info {
echo "orbdata_0.0.1"
return 1
}
function recipe_update {
echo "skipping update"
return 1
......
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