Commit 291bd40b authored by Kyle Stewart's avatar Kyle Stewart
Browse files

Fix missing MacOS dashes and function return issue

Dashes were missing from untar on MacOS.

Redirect fill_pyver errors to stderr, instead of returning them as the
result.
parent acd71c71
...@@ -74,11 +74,11 @@ function untar { ...@@ -74,11 +74,11 @@ function untar {
if [ -z "$in_fname" ];then echo "in_fname not defined"; exit 1; fi if [ -z "$in_fname" ];then echo "in_fname not defined"; exit 1; fi
local extension=${in_fname##*.} local extension=${in_fname##*.}
case $extension in case $extension in
tar) tar xf $in_fname ;; tar) tar -xf $in_fname ;;
gz|tgz) tar zxf $in_fname ;; gz|tgz) tar -zxf $in_fname ;;
bz2) tar jxf $in_fname ;; bz2) tar -jxf $in_fname ;;
zip) unzip $in_fname ;; zip) unzip $in_fname ;;
xz) unxz -c $in_fname | tar xf ;; xz) unxz -c $in_fname | tar -xf ;;
*) echo Did not recognize extension $extension; exit 1 ;; *) echo Did not recognize extension $extension; exit 1 ;;
esac esac
} }
......
...@@ -90,7 +90,7 @@ function fill_pyver { ...@@ -90,7 +90,7 @@ function fill_pyver {
elif [ $ver == "3.2" ]; then elif [ $ver == "3.2" ]; then
echo $LATEST_3p2 echo $LATEST_3p2
else else
echo "Can't fill version $ver" echo "Can't fill version $ver" 1>&2
exit 1 exit 1
fi fi
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment