diff --git a/bootstrap-root.sh b/bootstrap-root.sh index 70b8b3d..7bad116 100755 --- a/bootstrap-root.sh +++ b/bootstrap-root.sh @@ -1,6 +1,7 @@ #! /bin/bash # fail immediately on error set -e +CURLOPT=${CURLOPT:-"--location --remote-time --show-error --silent --fail --tlsv1.2"} apt update \ && apt dist-upgrade \ @@ -32,9 +33,9 @@ apt update \ && apt-file update # node related -curl -RLSsf1 https://deb.nodesource.com/setup_10.x | bash - +curl $CURLOPT https://deb.nodesource.com/setup_10.x | bash - apt-get install -y nodejs # python3 related -curl -RLSsf1 https://bootstrap.pypa.io/get-pip.py | python2 -curl -RLSsf1 https://bootstrap.pypa.io/get-pip.py | python3 +curl $CURLOPT https://bootstrap.pypa.io/get-pip.py | python2 +curl $CURLOPT https://bootstrap.pypa.io/get-pip.py | python3 diff --git a/bootstrap.sh b/bootstrap.sh index 821373f..3d7a545 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,9 +1,10 @@ -#! /bin/sh +#! /bin/bash # fail immediately on error set -e +CURLOPT=${CURLOPT:-"--location --remote-time --show-error --silent --fail --tlsv1.2"} # root part -curl -RLSsf1 https://github.com/schtobia/bootstrap/raw/master/bootstrap-root.sh | sudo -SEH bash - +curl $CURLOPT https://github.com/schtobia/bootstrap/raw/master/bootstrap-root.sh | sudo -SEH bash - # userspace part -curl -RLSsf1 https://github.com/schtobia/bootstrap/raw/master/bootstrap-user.sh | bash - +curl $CURLOPT https://github.com/schtobia/bootstrap/raw/master/bootstrap-user.sh | bash -