From 648c42220a5d381b6e35ed978fa2089098b58e99 Mon Sep 17 00:00:00 2001 From: Monanshi Shah Date: Mon, 22 Aug 2022 18:38:19 -0400 Subject: [PATCH 1/3] add quarto for python 3.9 --- content/base/bionic/maybe_install_quarto.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/base/bionic/maybe_install_quarto.sh b/content/base/bionic/maybe_install_quarto.sh index 103781af..be2d153a 100755 --- a/content/base/bionic/maybe_install_quarto.sh +++ b/content/base/bionic/maybe_install_quarto.sh @@ -1,8 +1,8 @@ #!/bin/bash -# only install quarto if python 3.10 and R 4.1 +# only install quarto if python 3.10 and R 4.1 OR python 3.9 and R 4.1 # TODO: figure out a different hierarchy... -if [[ `ls /opt/python/ | grep '3\.10\.'` ]] && [[ `ls /opt/R | grep '4\.1\.'` ]]; then +if [[ `ls /opt/python/ | grep '3\.10\.'` ]] && [[ `ls /opt/R | grep '4\.1\.'` ]] || [[ `ls /opt/python/ | grep '3\.9\.'` ]] && [[ `ls /opt/R | grep '4\.1\.'` ]] ; then qver=${QUARTO_VERSION:-1.0.37} echo '--> Installing Quarto' curl -L -o /quarto.deb https://github.com/quarto-dev/quarto-cli/releases/download/v${qver}/quarto-${qver}-linux-amd64.deb From 1513d71ca94d7a3ac8f4817227354921c8bdd059 Mon Sep 17 00:00:00 2001 From: Monanshi Shah Date: Tue, 23 Aug 2022 10:43:39 -0400 Subject: [PATCH 2/3] another set of brackets --- content/base/bionic/maybe_install_quarto.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/base/bionic/maybe_install_quarto.sh b/content/base/bionic/maybe_install_quarto.sh index be2d153a..cda2f200 100755 --- a/content/base/bionic/maybe_install_quarto.sh +++ b/content/base/bionic/maybe_install_quarto.sh @@ -2,7 +2,7 @@ # only install quarto if python 3.10 and R 4.1 OR python 3.9 and R 4.1 # TODO: figure out a different hierarchy... -if [[ `ls /opt/python/ | grep '3\.10\.'` ]] && [[ `ls /opt/R | grep '4\.1\.'` ]] || [[ `ls /opt/python/ | grep '3\.9\.'` ]] && [[ `ls /opt/R | grep '4\.1\.'` ]] ; then +if [[[ `ls /opt/python/ | grep '3\.10\.'` ]] && [[ `ls /opt/R | grep '4\.1\.'` ]]] || [[[ `ls /opt/python/ | grep '3\.9\.'` ]] && [[ `ls /opt/R | grep '4\.1\.'` ]]] ; then qver=${QUARTO_VERSION:-1.0.37} echo '--> Installing Quarto' curl -L -o /quarto.deb https://github.com/quarto-dev/quarto-cli/releases/download/v${qver}/quarto-${qver}-linux-amd64.deb From 435ed6de2c07f18166d5d8ea96a77f2f70cb665f Mon Sep 17 00:00:00 2001 From: Monanshi Shah Date: Tue, 23 Aug 2022 12:03:33 -0400 Subject: [PATCH 3/3] brackets --- content/base/bionic/maybe_install_quarto.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/base/bionic/maybe_install_quarto.sh b/content/base/bionic/maybe_install_quarto.sh index cda2f200..1e444063 100755 --- a/content/base/bionic/maybe_install_quarto.sh +++ b/content/base/bionic/maybe_install_quarto.sh @@ -2,7 +2,7 @@ # only install quarto if python 3.10 and R 4.1 OR python 3.9 and R 4.1 # TODO: figure out a different hierarchy... -if [[[ `ls /opt/python/ | grep '3\.10\.'` ]] && [[ `ls /opt/R | grep '4\.1\.'` ]]] || [[[ `ls /opt/python/ | grep '3\.9\.'` ]] && [[ `ls /opt/R | grep '4\.1\.'` ]]] ; then +if ([[ `ls /opt/python/ | grep '3\.10\.'` ]] && [[ `ls /opt/R | grep '4\.1\.'` ]]) || ([[ `ls /opt/python/ | grep '3\.9\.'` ]] && [[ `ls /opt/R | grep '4\.1\.'` ]]) ; then qver=${QUARTO_VERSION:-1.0.37} echo '--> Installing Quarto' curl -L -o /quarto.deb https://github.com/quarto-dev/quarto-cli/releases/download/v${qver}/quarto-${qver}-linux-amd64.deb