diff --git a/installer/pyinstaller/build-linux.sh b/installer/pyinstaller/build-linux.sh index 09c8f20591b..bdde24d2948 100644 --- a/installer/pyinstaller/build-linux.sh +++ b/installer/pyinstaller/build-linux.sh @@ -2,7 +2,8 @@ binary_zip_filename=$1 python_library_zip_filename=$2 python_version=$3 -nightly_build=$4 +build_binary_name=$4 +build_folder=$5 if [ "$python_library_zip_filename" = "" ]; then python_library_zip_filename="python-libraries.zip"; @@ -12,8 +13,8 @@ if [ "$python_version" = "" ]; then python_version="3.7.9"; fi -if ! [ "$nightly_build" = "" ]; then - echo "Building native installer with nightly build" +if ! [ "$build_binary_name" = "" ]; then + echo "Building native installer with nightly/beta build" is_nightly="true" else echo "Building native installer with normal build" @@ -58,8 +59,8 @@ echo "Installing PyInstaller" echo "Building Binary" cd src if [ "$is_nightly" = "true" ]; then - echo "Updating samcli.spec with nightly build" - sed -i.bak "s/'sam'/'sam-nightly'/g" installer/pyinstaller/samcli.spec + echo "Updating samcli.spec with nightly/beta build" + sed -i.bak "s/'sam'/'$build_binary_name'/g" installer/pyinstaller/samcli.spec rm installer/pyinstaller/samcli.spec.bak fi echo "samcli.spec content is:" @@ -70,17 +71,17 @@ cat installer/pyinstaller/samcli.spec mkdir pyinstaller-output dist_folder="sam" if [ "$is_nightly" = "true" ]; then - echo "using dist_folder with nightly build" - dist_folder="sam-nightly" + echo "using dist_folder with nightly/beta build" + dist_folder=$build_binary_name fi echo "dist_folder=$dist_folder" mv "dist/$dist_folder" pyinstaller-output/dist cp installer/assets/* pyinstaller-output chmod 755 pyinstaller-output/install if [ "$is_nightly" = "true" ]; then - echo "Updating install script with nightly build" - sed -i.bak "s/\/usr\/local\/aws-sam-cli/\/usr\/local\/aws-sam-cli-nightly/g" pyinstaller-output/install - sed -i.bak 's/EXE_NAME=\"sam\"/EXE_NAME=\"sam-nightly\"/g' pyinstaller-output/install + echo "Updating install script with nightly/beta build" + sed -i.bak "s/\/usr\/local\/aws-sam-cli/\/usr\/local\/$build_folder/g" pyinstaller-output/install + sed -i.bak 's/EXE_NAME=\"sam\"/EXE_NAME=\"'$build_binary_name'\"/g' pyinstaller-output/install rm pyinstaller-output/install.bak fi echo "install script content is:"