Switch redox recipe to master branch

coolreader18 · coolreader18 · commit cfd0d0564283 · 2019-07-13T16:59:13.000-05:00
diff --git a/redox/install.sh b/redox/install.sh
@@ -15,15 +15,16 @@ case $# in
 	;;
 esac
 
-if [[ ! -d cookbook ]]; then
-	echo "You do not appear to be in a redox checkout (no 'cookbook' directory). " \
-		"Please run this script from or specify as an argument the root of your redox checkout." >&2
+if [[ ! -d cookbook ]] || [[ ! -f filesystem.toml ]]; then
+	echo "You do not appear to be in a redox checkout (no 'cookbook'" \
+		" directory or filesystem.toml file). Please run this script from or " \
+		"specify as an argument the root of your redox checkout." >&2
 	exit 1
 fi
 
 mkdir -p cookbook/recipes/rustpython
 
-cp "$DIR"/redox_recipe.sh cookbook/recipes/rustpython/recipe.sh
+cp "$DIR"/recipe.sh cookbook/recipes/rustpython/
 
 if ! grep -q -w rustpython filesystem.toml; then
 	sed -i 's/\[packages\]/[packages]\nrustpython = {}/' filesystem.toml
diff --git a/redox/recipe.sh b/redox/recipe.sh
@@ -1,5 +1,4 @@
 GIT=https://github.com/RustPython/RustPython
-BRANCH=redox
 CARGOFLAGS=--no-default-features
 export BUILDTIME_RUSTPYTHONPATH=/lib/rustpython/
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`GIT=https://github.com/RustPython/RustPython`
`2`		`-BRANCH=redox`
`3`	`2`	`CARGOFLAGS=--no-default-features`
`4`	`3`	`export BUILDTIME_RUSTPYTHONPATH=/lib/rustpython/`
`5`	`4`