diff --git a/generator/_regenerate_json.sh b/generator/_regenerate_json.sh index bc4ba4201..1e875a927 100755 --- a/generator/_regenerate_json.sh +++ b/generator/_regenerate_json.sh @@ -72,11 +72,6 @@ do "$cf_promises" --eval-functions --policy-output-format=json ${policy} | sed '/ error\:.*/d' > ${out} # Do we need --eval-functions? echo "Writing '${out}'" - printf '%0.1s' "-"{1..60} - echo - cat "${out}" - printf '%0.1s' "-"{1..60} - echo done # We extract the --help output from each component for inclusion in the component specific documentation page under reference/components/ diff --git a/generator/build/install.sh b/generator/build/install.sh index f80037d22..846ff19f5 100644 --- a/generator/build/install.sh +++ b/generator/build/install.sh @@ -4,31 +4,31 @@ set -ex # All of these commands are executed by the jenkins user. -sudo apt-get install -y curl gnupg2 wget git +sudo apt-get install -y -qq curl gnupg2 wget git # some of packages below depend on tzdata. Installing it without DEBIAN_FRONTEND=noninteractive causes it to ask where in the world are you, interrupting the build process -DEBIAN_FRONTEND=noninteractive sudo --preserve-env=DEBIAN_FRONTEND apt-get install -y tzdata +DEBIAN_FRONTEND=noninteractive sudo --preserve-env=DEBIAN_FRONTEND apt-get install -y -qq tzdata # Docslave specifics # These packages are needed as a dependency of the nokogiri ruby gem (which in turn is a dependency of the sanitize ruby gem). -sudo apt-get install -y libxslt-dev libxml2-dev +sudo apt-get install -y -qq libxslt-dev libxml2-dev # Python is needed for our pre and post processing scripts. -sudo apt-get install -y python3 +sudo apt-get install -y -qq python3 # These packages are needed to satisfy rvm requirements. # hint: to figure out rvm requirements, comment this line and watch output of `rvm install ... ruby`. # To make script stop at that command, change --autolibs argument to read-fail. # Also you likely will want to exclude 'libssl1.0-dev' since it's and openssl 1.0 library, which is not shipped on modern distros. -sudo apt-get install -y gawk g++ gcc autoconf automake bison libc6-dev libffi-dev libgdbm-dev libncurses5-dev libsqlite3-dev libtool libyaml-dev make pkg-config sqlite3 zlib1g-dev libgmp-dev libreadline-dev +sudo apt-get install -y -qq gawk g++ gcc autoconf automake bison libc6-dev libffi-dev libgdbm-dev libncurses5-dev libsqlite3-dev libtool libyaml-dev make pkg-config sqlite3 zlib1g-dev libgmp-dev libreadline-dev -sudo apt-get install -y default-jdk +sudo apt-get install -y -qq default-jdk -curl -sL https://deb.nodesource.com/setup_16.x -o nodesource_setup.sh +curl -sL https://deb.nodesource.com/setup_21.x -o nodesource_setup.sh sudo bash nodesource_setup.sh -sudo apt-get install -y nodejs +sudo apt-get install -y -qq nodejs node --version npm --version diff --git a/generator/build/install_hugo.sh b/generator/build/install_hugo.sh index 3b9ff0f08..51c96eb19 100644 --- a/generator/build/install_hugo.sh +++ b/generator/build/install_hugo.sh @@ -1,6 +1,6 @@ #!/bin/bash -wget https://github.com/gohugoio/hugo/releases/download/v0.154.2/hugo_0.154.2_Linux-64bit.tar.gz -O hugo.tar.gz +wget -nv https://github.com/gohugoio/hugo/releases/download/v0.154.2/hugo_0.154.2_Linux-64bit.tar.gz -O hugo.tar.gz echo "6473b8fe2ff0a5b13af217eb780f3a03aa34d43ba4506314c6156f11074a418d hugo.tar.gz" | sha256sum -c if [ $? -eq 1 ]; then exit 2 diff --git a/generator/build/main.sh b/generator/build/main.sh index a55ef1dd7..1c10f1596 100644 --- a/generator/build/main.sh +++ b/generator/build/main.sh @@ -78,8 +78,8 @@ test ! -z "$PACKAGE_BUILD" echo "Install hub package" if [ "$PACKAGE_JOB" = "cf-remote" ]; then echo "Install using cf-remote" - sudo apt update -y - sudo apt install -y python3-venv pipx + sudo apt update -y -qq + sudo apt install -y -qq python3-venv pipx pipx install cf-remote export PATH="$HOME/.local/bin:$PATH" # shellcheck source=/dev/null