Merge pull request aws#39 from flarcher/fix-install-from-CI-container-with-root-user

SukanyaHanumanthu · web-flow · commit a6524b0cdc1b · 2021-11-26T11:25:16.000Z
(aws#37) Adds '--no-same-owner' option to all scripts tar commands
diff --git a/scripts/preinstall.sh b/scripts/preinstall.sh
@@ -23,8 +23,8 @@ else
     rm -rf ./aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE
 
     # unpack dependencies
-    tar xzf ./curl-$CURL_VERSION.tar.gz && \
-    tar xzf ./aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE.tar.gz
+    tar xzf ./curl-$CURL_VERSION.tar.gz --no-same-owner && \
+    tar xzf ./aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE.tar.gz --no-same-owner
 
     (
         # Build Curl
diff --git a/scripts/update_deps.sh b/scripts/update_deps.sh
@@ -25,5 +25,5 @@ wget -c https://github.com/awslabs/aws-lambda-cpp/archive/v$AWS_LAMBDA_CPP_RELEA
 )
 
 ## Pack again and remove the folder
-tar -czvf aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE.tar.gz aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE && \
+tar -czvf aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE.tar.gz aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE --no-same-owner && \
   rm -rf aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ else`
`23`	`23`	`rm -rf ./aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE`
`24`	`24`
`25`	`25`	`# unpack dependencies`
`26`		`- tar xzf ./curl-$CURL_VERSION.tar.gz && \`
`27`		`- tar xzf ./aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE.tar.gz`
	`26`	`+ tar xzf ./curl-$CURL_VERSION.tar.gz --no-same-owner && \`
	`27`	`+ tar xzf ./aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE.tar.gz --no-same-owner`
`28`	`28`
`29`	`29`	`(`
`30`	`30`	`# Build Curl`
Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,5 @@ wget -c https://github.com/awslabs/aws-lambda-cpp/archive/v$AWS_LAMBDA_CPP_RELEA`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`## Pack again and remove the folder`
`28`		`-tar -czvf aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE.tar.gz aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE && \`
	`28`	`+tar -czvf aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE.tar.gz aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE --no-same-owner && \`
`29`	`29`	`rm -rf aws-lambda-cpp-$AWS_LAMBDA_CPP_RELEASE`