diff options
Diffstat (limited to 'lang/python/python-package-install.sh')
| -rw-r--r-- | lang/python/python-package-install.sh | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lang/python/python-package-install.sh b/lang/python/python-package-install.sh index 6b4fe54b1..2ca2abc16 100644 --- a/lang/python/python-package-install.sh +++ b/lang/python/python-package-install.sh @@ -43,11 +43,7 @@ process_filespec() { delete_empty_dirs() { local dst_dir="$1" if [ -d "$dst_dir/usr" ] ; then - for _ in $(seq 1 10) ; do - find "$dst_dir/usr" -empty -type d -exec rmdir {} \; || continue - break - done - rmdir "$dst_dir/usr" || true + find "$dst_dir/usr" -empty -type d -delete fi } @@ -60,7 +56,7 @@ filespec="$6" SED="${SED:-sed -e}" -find "$src_dir" -name "*\.exe" -exec rm -f {} \; +find "$src_dir" -name "*.exe" -delete process_filespec "$src_dir" "$dst_dir" "$filespec" || { echo "process filespec error-ed" @@ -75,7 +71,7 @@ fi if [ "$mode" == "sources" ] ; then # Copy only python source files - find "$dst_dir" -not -type d -not -name "*\.py" -exec rm -f {} \; + find "$dst_dir" -not -type d -not -name "*.py" -delete delete_empty_dirs "$dst_dir" exit 0 @@ -83,6 +79,8 @@ fi legacy= [ "$ver" == "3" ] && legacy="-b" +# default max recursion is 10 +max_recursion_level=20 # XXX [So that you won't goof as I did] # Note: Yes, I tried to use the -O & -OO flags here. @@ -90,14 +88,14 @@ legacy= # So, we just stuck to un-optimized byte-codes, # which is still way better/faster than running # Python sources all the time. -$python -m compileall $legacy -d '/' "$dst_dir" || { +$python -m compileall -r "$max_recursion_level" $legacy -d '/' "$dst_dir" || { echo "python -m compileall err-ed" exit 1 } # Delete source files and pyc [ un-optimized bytecode files ] # We may want to make this optimization thing configurable later, but not sure atm -find "$dst_dir" -type f -name "*\.py" -exec rm -f {} \; +find "$dst_dir" -type f -name "*.py" -delete delete_empty_dirs "$dst_dir" |