From 9fe3134cd6346cd8aba2d4f73c181f13c9af4585 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Tue, 3 Nov 2020 15:55:19 +0300 Subject: [PATCH 1/8] remove quotes on post-deployment step --- images/linux/scripts/installers/post-deployment.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index d427a172e..9b3e2fe07 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -17,13 +17,11 @@ rm -rf $HELPER_SCRIPT_FOLDER rm -rf $INSTALLER_SCRIPT_FOLDER chmod 755 $IMAGE_FOLDER -# Check PATH -if [[ $PATH == \"*\" ]] -then - echo "ERROR: PATH contains quotes" - echo "PATH = $PATH" - exit 1 -fi +# Remove quotes from PATH +PATH=${PATH#"\""} +PATH=${PATH%"\""} +echo "PATH=$PATH" | sudo tee -a /etc/environment +echo "Updated PATH: $PATH # Clean yarn and npm cache yarn cache clean From 09533dd5e91bce212f0b176aaa9857edfbaf1285 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Tue, 3 Nov 2020 15:56:49 +0300 Subject: [PATCH 2/8] fixed comment --- images/linux/scripts/installers/post-deployment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index 9b3e2fe07..36a914c63 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -17,7 +17,7 @@ rm -rf $HELPER_SCRIPT_FOLDER rm -rf $INSTALLER_SCRIPT_FOLDER chmod 755 $IMAGE_FOLDER -# Remove quotes from PATH +# Remove quotes around PATH PATH=${PATH#"\""} PATH=${PATH%"\""} echo "PATH=$PATH" | sudo tee -a /etc/environment From 9d8d110fcf7e00fb55c89ba3b48c393af73d5c2d Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Wed, 4 Nov 2020 00:42:36 +0300 Subject: [PATCH 3/8] typo --- images/linux/scripts/installers/post-deployment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index 36a914c63..2c7e65143 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -21,7 +21,7 @@ chmod 755 $IMAGE_FOLDER PATH=${PATH#"\""} PATH=${PATH%"\""} echo "PATH=$PATH" | sudo tee -a /etc/environment -echo "Updated PATH: $PATH +echo "Updated PATH: $PATH" # Clean yarn and npm cache yarn cache clean From 98731b3621b18f424be83be0e03eca9baf63b636 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Thu, 5 Nov 2020 10:36:01 +0300 Subject: [PATCH 4/8] get PATH from /etc/environment --- images/linux/scripts/installers/post-deployment.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index 2c7e65143..403a10971 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -18,10 +18,11 @@ rm -rf $INSTALLER_SCRIPT_FOLDER chmod 755 $IMAGE_FOLDER # Remove quotes around PATH -PATH=${PATH#"\""} -PATH=${PATH%"\""} -echo "PATH=$PATH" | sudo tee -a /etc/environment -echo "Updated PATH: $PATH" +ENVPATH=$(cat /etc/environment | sed -z 's/^.*PATH=*//') +ENVPATH=${ENVPATH#"\""} +ENVPATH=${ENVPATH%"\""} +echo "PATH=$ENVPATH" | sudo tee -a /etc/environment +echo "Updated /etc/environment: $(cat /etc/environment)" # Clean yarn and npm cache yarn cache clean From 31b11e1576fe59335ba4845df91aa8515308b427 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Thu, 5 Nov 2020 15:38:26 +0300 Subject: [PATCH 5/8] select last entry of PATH, respect eol --- images/linux/scripts/installers/post-deployment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index 403a10971..4202469d2 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -18,7 +18,7 @@ rm -rf $INSTALLER_SCRIPT_FOLDER chmod 755 $IMAGE_FOLDER # Remove quotes around PATH -ENVPATH=$(cat /etc/environment | sed -z 's/^.*PATH=*//') +ENVPATH=$(grep 'PATH=' /etc/environment | tail -1 | sed -z 's/^.*PATH=*//') ENVPATH=${ENVPATH#"\""} ENVPATH=${ENVPATH%"\""} echo "PATH=$ENVPATH" | sudo tee -a /etc/environment From 0269bec6f466b9ff76a8b2e89e546640b0fced52 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Thu, 5 Nov 2020 22:08:19 +0300 Subject: [PATCH 6/8] grep first entry of PATH --- images/linux/scripts/installers/post-deployment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index 4202469d2..c14c00d77 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -18,7 +18,7 @@ rm -rf $INSTALLER_SCRIPT_FOLDER chmod 755 $IMAGE_FOLDER # Remove quotes around PATH -ENVPATH=$(grep 'PATH=' /etc/environment | tail -1 | sed -z 's/^.*PATH=*//') +ENVPATH=$(grep 'PATH=' /etc/environment | head -n 1 | sed -z 's/^PATH=*//') ENVPATH=${ENVPATH#"\""} ENVPATH=${ENVPATH%"\""} echo "PATH=$ENVPATH" | sudo tee -a /etc/environment From 45b33107cde77c43cfe3f8dc69aa1658d6c73a35 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Fri, 6 Nov 2020 00:33:39 +0300 Subject: [PATCH 7/8] Fix brew repository permissions to make it clean --- images/linux/scripts/installers/post-deployment.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index c14c00d77..15f3ebd8c 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -24,6 +24,10 @@ ENVPATH=${ENVPATH%"\""} echo "PATH=$ENVPATH" | sudo tee -a /etc/environment echo "Updated /etc/environment: $(cat /etc/environment)" +# Fix brew repository permissions to make it clean +cd $(brew --prefix)/Homebrew +git reset --hard + # Clean yarn and npm cache yarn cache clean npm cache clean --force \ No newline at end of file From 981df9e44fdb7e897bcf2f25696625f0a468c246 Mon Sep 17 00:00:00 2001 From: Leonid Lapshin Date: Fri, 6 Nov 2020 00:56:14 +0300 Subject: [PATCH 8/8] revert brew fix --- images/linux/scripts/installers/post-deployment.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh index 15f3ebd8c..c14c00d77 100644 --- a/images/linux/scripts/installers/post-deployment.sh +++ b/images/linux/scripts/installers/post-deployment.sh @@ -24,10 +24,6 @@ ENVPATH=${ENVPATH%"\""} echo "PATH=$ENVPATH" | sudo tee -a /etc/environment echo "Updated /etc/environment: $(cat /etc/environment)" -# Fix brew repository permissions to make it clean -cd $(brew --prefix)/Homebrew -git reset --hard - # Clean yarn and npm cache yarn cache clean npm cache clean --force \ No newline at end of file