Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 3dad4a1

Browse files
committed
Small fixes
1 parent fc2f92c commit 3dad4a1

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

‎_make.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ find . -name '*.pyc' -delete
6666
# Produce output
6767
if [[ "$RAW_MODE" = true ]]; then
6868
# Copy raw files to layer directory
69-
echo "${CURRENT_DIR}/layer"
69+
rm -rf "${CURRENT_DIR}/layer"
7070
mkdir -p "${CURRENT_DIR}/layer"
7171
cp -R /tmp/base/. "${CURRENT_DIR}/layer"
7272
echo "Raw layer contents have been copied to the 'layer' subdirectory"

‎build.sh‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ if [[ -f "${CURRENT_DIR}/_clean.sh" ]]; then
8181
elif [[ -f "${PARENT_DIR}/_clean.sh" ]]; then
8282
CLEAN_PATH="${PARENT_DIR}/_clean.sh"
8383
echo "Using clean.sh from ../"
84+
elif [[ -f "${CURRENT_DIR}/$(dirname "${BASH_SOURCE[0]}")/_clean.sh" ]]; then
85+
CLEAN_PATH="${PARENT_DIR}/$(dirname "${BASH_SOURCE[0]}")/_clean.sh"
86+
echo "Using clean.sh from ../$(dirname "${BASH_SOURCE[0]}")"
8487
else
8588
echo "Using default cleaning step"
8689
fi
@@ -92,7 +95,7 @@ else
9295
fi
9396

9497
# Run build
95-
docker run --rm -e PYTHON_VER="$PYTHON_VER" -e NAME="$NAME" -e RAW_MODE="$RAW_MODE" -v "$CURRENT_DIR":/var/task -v "$REQ_PATH":/temp/build/requirements.txt -v "$CLEAN_PATH":/temp/build/_clean.sh "lambci/lambda:build-python${PYTHON_VER}" bash /var/task/_make.sh
98+
docker run --rm -e PYTHON_VER="$PYTHON_VER" -e NAME="$NAME" -e RAW_MODE="$RAW_MODE" -e PARENT_DIR="${PARENT_DIR}" -e SUBDIR_MODE="$SUBDIR_MODE" -v "$CURRENT_DIR":/var/task -v "$REQ_PATH":/temp/build/requirements.txt -v "$CLEAN_PATH":/temp/build/_clean.sh "lambci/lambda:build-python${PYTHON_VER}" bash /var/task/_make.sh
9699

97100
# Move ZIP to parent dir if SUBDIR_MODE set
98101
if [[ "$SUBDIR_MODE" ]]; then
@@ -101,5 +104,7 @@ if [[ "$SUBDIR_MODE" ]]; then
101104
if [[ -f "${PARENT_DIR}/${ZIP_FILE}" ]]; then
102105
mv "${PARENT_DIR}/${ZIP_FILE}" "${PARENT_DIR}/${ZIP_FILE}.bak"
103106
fi
104-
mv "${CURRENT_DIR}/${ZIP_FILE}" "${PARENT_DIR}"
107+
if [[ "$RAW_MODE" != true ]]; then
108+
mv "${CURRENT_DIR}/${ZIP_FILE}" "${PARENT_DIR}"
109+
fi
105110
fi

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /