Skip to content

Commit

Permalink
Fix bundle-redex.sh in Makefile
Browse files Browse the repository at this point in the history
Summary:
Local errors were silently hidden - add `set -e`.

Fix the glob. Fix how the Makefile is pushing the `src_dir`.

Reviewed By: beicy

Differential Revision: D54360801

fbshipit-source-id: 70be5df65dc47eaeca2b425f1131d226401f178d
  • Loading branch information
agampe authored and facebook-github-bot committed Feb 29, 2024
1 parent 6d0f4de commit 44aa6ee
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -598,4 +598,4 @@ PYTHON_SRCS := redex.py \
$(GENERATED_API_LEVELS_MODULE)

redex: redex-all $(PYTHON_SRCS)
$(srcdir)/bundle-redex.sh "$(srcdir)"
SRC_DIR="$(srcdir)" $(srcdir)/bundle-redex.sh
4 changes: 3 additions & 1 deletion bundle-redex.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

set -e

SRC_DIR="${SRC_DIR:-.}"

if [ -f "generated_apilevels.py" ] ; then
Expand All @@ -12,6 +14,6 @@ else
GEN_APILEVELS_INPUT=
fi

tar czf redex.tar.gz redex-all "${SRC_DIR}/redex.py" "${SRC_DIR}/pyredex/*.py" $GEN_APILEVELS_INPUT
tar czf redex.tar.gz redex-all "${SRC_DIR}/redex.py" "${SRC_DIR}"/pyredex/*.py $GEN_APILEVELS_INPUT
cat "${SRC_DIR}/selfextract.sh" redex.tar.gz > redex
chmod +x redex

0 comments on commit 44aa6ee

Please sign in to comment.