Fix deploy scripts

Author: philipp94831

Pipfile

@@ -7,7 +7,7 @@ name = "pypi"
 awscli = ">=1.16.164"
 
 [dev-packages]
-aws-sam-cli = ">=0.16.1"
+aws-sam-cli = ">=0.17.0"
 
 [requires]
 python_version = "3.7"

Pipfile.lock

@@ -19,5 +19,4 @@ mkdir -p ${BUILD_DIR}/layer/
 docker run -v ${BUILD_DIR}/layer/:/var/awspack -v ${BASE_DIR}/entrypoint.sh:/entrypoint.sh \
     lambda-r:build-${VERSION} /entrypoint.sh
 sudo chown -R $(whoami):$(whoami) ${BUILD_DIR}/layer/
-cd ${BUILD_DIR}/layer/
-chmod -R 755 .
+chmod -R 755 ${BUILD_DIR}/layer/

awspack/build.sh

@@ -19,8 +19,4 @@ rm -rf ${BUILD_DIR}
 export R_LIBS=${BUILD_DIR}/layer/R/library
 mkdir -p ${R_LIBS}
 ${R_DIR}/bin/Rscript -e 'install.packages("awspack", repos="http://cran.r-project.org")'
-cd ${BUILD_DIR}/layer/
-chmod -R 755 .
-zip -r -q awspack-${VERSION}.zip .
-mkdir -p ${BUILD_DIR}/dist/
-mv awspack-${VERSION}.zip ${BUILD_DIR}/dist/
+chmod -R 755 ${BUILD_DIR}/layer/

awspack/compile.sh

@@ -13,10 +13,11 @@ fi
 BASE_DIR=$(pwd)
 BUILD_DIR=${BASE_DIR}/build/
 
-./build.sh ${VERSION}
+cd ${BUILD_DIR}/layer/
 zip -r -q awspack-${VERSION}.zip .
 mkdir -p ${BUILD_DIR}/dist/
 mv awspack-${VERSION}.zip ${BUILD_DIR}/dist/
+version_="${VERSION//\./_}"
 aws lambda publish-layer-version \
-    --layer-name r-awspack-${VERSION} \
-    --zip-file fileb://build/dist/awspack-${VERSION}.zip
+    --layer-name r-awspack-${version_} \
+    --zip-file fileb://${BUILD_DIR}/dist/awspack-${VERSION}.zip

awspack/deploy.sh

@@ -17,4 +17,4 @@ do
    mv R.orig/library/${package}/ R/library/${package}/
 done
 rm -rf R.orig/
-chmod -R 755 R/
+chmod -R 755 .

recommended/build.sh

@@ -13,10 +13,11 @@ fi
 BASE_DIR=$(pwd)
 BUILD_DIR=${BASE_DIR}/build/
 
-./build.sh
-zip -r -q recommended-${VERSION}.zip R/
+cd ${BUILD_DIR}/layer/
+zip -r -q recommended-${VERSION}.zip .
 mkdir -p ${BUILD_DIR}/dist/
 mv recommended-${VERSION}.zip ${BUILD_DIR}/dist/
+version_="${VERSION//\./_}"
 aws lambda publish-layer-version \
-    --layer-name r-recommended-${VERSION} \
-    --zip-file fileb://build/dist/recommended-${VERSION}.zip
+    --layer-name r-recommended-${version_} \
+    --zip-file fileb://${BUILD_DIR}/dist/recommended-${VERSION}.zip

recommended/deploy.sh

@@ -13,10 +13,11 @@ fi
 BASE_DIR=$(pwd)
 BUILD_DIR=${BASE_DIR}/build/
 
-./build.sh
+cd ${BUILD_DIR}/layer/
 zip -r -q runtime-${VERSION}.zip .
 mkdir -p ${BUILD_DIR}/dist/
 mv runtime-${VERSION}.zip ${BUILD_DIR}/dist/
+version_="${VERSION//\./_}"
 aws lambda publish-layer-version \
-    --layer-name r-runtime-${VERSION} \
-    --zip-file fileb://build/dist/runtime-${VERSION}.zip
+    --layer-name r-runtime-${version_} \
+    --zip-file fileb://${BUILD_DIR}/dist/runtime-${VERSION}.zip