configure.sh - simplify vendoring calls, shellcheck

Author: cscheid

configure.sh

@@ -29,51 +29,56 @@ function download() {
 
 QUARTO_VENDOR_BINARIES=${QUARTO_VENDOR_BINARIES=true}
 
-DENO_BIN=${QUARTO_DENO=$QUARTO_BIN_PATH/tools/$DENO_DIR/deno}
+DENO_BIN=${QUARTO_DENO=$QUARTO_BIN_PATH/tools/$DENO_ARCH_DIR/deno}
 
 if [[ "${QUARTO_VENDOR_BINARIES}" = "true" ]]; then
-  DENO_VERSION_NO_V=$(echo $DENO | sed 's/v//')
-  if [[ (! -f "$DENO_BIN") || $("$DENO_BIN" --version | grep $DENO_VERSION_NO_V) == "" ]]; then
+  DENO_VERSION_NO_V=$(echo "$DENO" | sed 's/v//')
+  if [[ (! -f "$DENO_BIN") || $("$DENO_BIN" --version | grep "$DENO_VERSION_NO_V") == "" ]]; then
     # Ensure directory is there for Deno
     echo "Bootstrapping Deno..."
 
-    rm -rf $QUARTO_DIST_PATH
+    rm -rf "$QUARTO_DIST_PATH"
 
     ## Binary Directory
     mkdir -p "$QUARTO_BIN_PATH/tools"
-    cd $QUARTO_BIN_PATH/tools
+    cd "$QUARTO_BIN_PATH/tools"
 
     # Download Deno
     for DENOFILE in $DENOFILES; do
       download "$DENOURL/$DENO/$DENOFILE" "$DENOFILE"
-      unzip -o $DENOFILE
-      
-      mkdir -p $DENO_DIR
-      mv deno $DENO_DIR
-      rm $DENOFILE
+      unzip -o "$DENOFILE"
+      mkdir -p "$DENO_ARCH_DIR"
+      mv deno "$DENO_ARCH_DIR"
+      rm "$DENOFILE"
     done
 
     # we create a symlink here so that we need only one quarto-cli.code-workspace file
-    ln -s $DENO_DIR/deno deno
+    ln -s $DENO_ARCH_DIR/deno deno
 
     # If a canary commit is provided, upgrade to that
-    if [ ! -z "$DENO_CANARY_COMMIT" ]; then
+    if [ -n "$DENO_CANARY_COMMIT" ]; then
       echo [Upgrading Deno to Canary]
-      ./deno upgrade --canary --version $DENO_CANARY_COMMIT
+      ./deno upgrade --canary --version "$DENO_CANARY_COMMIT"
     fi
 
     # write deno version file for later use
-    mkdir -p $QUARTO_BIN_PATH/../config
-    echo $DENO > $QUARTO_BIN_PATH/../config/deno-version
+    mkdir -p "$QUARTO_BIN_PATH/../config"
+    echo "$DENO" > "$QUARTO_BIN_PATH/../config/deno-version"
   fi
-  export DENO_BIN_PATH=$QUARTO_BIN_PATH/tools/$DENO_DIR/deno
+  export DENO_BIN_PATH=$QUARTO_BIN_PATH/tools/$DENO_ARCH_DIR/deno
 else
   if [ -z "$DENO_BIN_PATH" ]; then
     echo "DENO_BIN_PATH is not set. You either need to allow QUARTO_VENDOR_BINARIES or set DENO_BIN_PATH to the path of a deno binary."
     exit 1
   fi
 fi
 
+if [ "$QUARTO_DENO_DIR" == "" ]; then
+  export DENO_DIR=$QUARTO_BIN_PATH/deno_cache
+else
+  export DENO_DIR=$QUARTO_DENO_DIR
+fi
+
 echo "Downloading Deno Stdlib"
 "${QUARTO_PACKAGE_PATH}/scripts/deno_std/download.sh"
 
@@ -82,8 +87,10 @@ pushd "$QUARTO_PACKAGE_PATH/src/"
 # Run the configure command to bootstrap installation
 ./quarto-bld configure --log-level info
 
+popd
+
 # download typescript dependencies
-../scripts/vendoring/vendor.sh
+source package/scripts/vendoring/vendor.sh
 
 # Run the quarto command with 'reload', which will force the import_map dependencies
 # to be reloaded

package/scripts/common/utils.sh

@@ -1,15 +1,15 @@
-# DENOFILES is only required at configure.sh, but DENO_DIR is used in many places
+# DENOFILES is only required at configure.sh, but DENO_ARCH_DIR is used in many places
 
 if [[ $OSTYPE == 'darwin'* ]]; then
   DENOURL=https://github.com/denoland/deno/releases/download
   FULLARCH=$(uname -sm)
 
 
   if [[ $FULLARCH == "Darwin x86_64" ]]; then
-    DENO_DIR=x86_64
+    DENO_ARCH_DIR=x86_64
     DENOFILES="deno-x86_64-apple-darwin.zip"
   elif [[ $FULLARCH == "Darwin arm64" ]]; then
-    DENO_DIR=aarch64
+    DENO_ARCH_DIR=aarch64
     DENOFILES="deno-aarch64-apple-darwin.zip"
   else
     echo "configure script failed: unrecognized architecture " ${FULLARCH}
@@ -21,11 +21,11 @@ else
   if [[ $NIXARCH == "x86_64" ]]; then
     DENOURL=https://github.com/denoland/deno/releases/download
     DENOFILES=deno-x86_64-unknown-linux-gnu.zip
-    DENO_DIR=x86_64
+    DENO_ARCH_DIR=x86_64
   elif [[ $NIXARCH == "aarch64" ]]; then
     DENOURL=https://github.com/denoland/deno/releases/download
     DENOFILES=deno-aarch64-unknown-linux-gnu.zip
-    DENO_DIR=aarch64
+    DENO_ARCH_DIR=aarch64
   else
     echo "configure script failed: unrecognized architecture " ${NIXARCH}
     exit 1

package/scripts/deno_std/download.sh

@@ -5,7 +5,7 @@ source "$SCRIPT_PATH/../../../configuration"
 source "$SCRIPT_PATH/../../src/set_package_paths.sh"
 
 if [ -z "$QUARTO_DENO" ]; then
-  export QUARTO_DENO="$QUARTO_DIST_PATH/bin/tools/$DENO_DIR/deno"
+  export QUARTO_DENO="$QUARTO_DIST_PATH/bin/tools/$DENO_ARCH_DIR/deno"
 fi
 
 

package/scripts/vendoring/vendor.sh

@@ -1,52 +1,29 @@
-#!/usr/bin/env bash
-
-source configuration
-
-# Defaults are set in configuration file, but can be overridden here.
-#  We can't put these overrides in the configuration file because it is parsed
-#  very naively on windows.
-export DENO=${DENO_VERSION=$DENO}
-export DENO_DOM=${DENO_DOM_VERSION=$DENO_DOM}
-export PANDOC=${PANDOC_VERSION=$PANDOC}
-export DARTSASS=${DART_SASS_VERSION=$DARTSASS}
-export ESBUILD=${ESBUILD_VERSION=$ESBUILD}
-export TYPST=${TYPST_VERSION=$TYPST}
-
-source package/scripts/common/utils.sh
-source package/src/set_package_paths.sh
-
-QUARTO_VENDOR_BINARIES=${QUARTO_VENDOR_BINARIES=true}
-
-DENO_BIN=${QUARTO_DENO=$QUARTO_BIN_PATH/tools/$DENO_DIR/deno}
-
+# You should not need to run this script directly. 
+# It is sourced by the configure.sh script.
 if [[ "${QUARTO_VENDOR_BINARIES}" = "true" ]]; then
-  export DENO_BIN_PATH=$QUARTO_BIN_PATH/tools/$DENO_DIR/deno
+  export DENO_BIN_PATH=$QUARTO_BIN_PATH/tools/$DENO_ARCH_DIR/deno
 else
   if [ -z "$DENO_BIN_PATH" ]; then
     echo "DENO_BIN_PATH is not set. You either need to allow QUARTO_VENDOR_BINARIES or set DENO_BIN_PATH to the path of a deno binary."
     exit 1
   fi
 fi
-export DENO_DIR=$QUARTO_BIN_PATH/deno_cache
+
+if [ -z "$DENO_DIR" ]; then
+  export DENO_DIR=$QUARTO_BIN_PATH/deno_cache
+fi
 
 echo Revendoring quarto dependencies
 
 # remove deno_cache directory first
 if [ -d "$DENO_DIR" ]; then
-  rm -rf $DENO_DIR
+  rm -rf "$DENO_DIR"
 fi
 
-pushd ${QUARTO_SRC_PATH}
+pushd "${QUARTO_SRC_PATH}"
 set +e
 for entrypoint in quarto.ts vendor_deps.ts ../tests/test-deps.ts ../package/scripts/deno_std/deno_std.ts; do
-  $DENO_BIN_PATH install --allow-all --no-config --entrypoint $entrypoint --importmap=$QUARTO_SRC_PATH/import_map.json
+  $DENO_BIN_PATH install --allow-all --no-config --entrypoint $entrypoint "--importmap=$QUARTO_SRC_PATH/import_map.json"
 done
-return_code="$?"
 set -e
-if [[ ${return_code} -ne 0 ]]; then
-  echo "deno vendor failed (likely because of a download error)."
-  exit 1
-else
-  rm -rf vendor-${today}
-fi
 popd

package/src/quarto-bld

@@ -9,7 +9,7 @@ source "${SCRIPT_PATH}/../../configuration"
 source "${SCRIPT_PATH}/set_package_paths.sh"
 
 if [ -z "$QUARTO_DENO" ]; then
-  export QUARTO_DENO=$SCRIPT_PATH/../dist/bin/tools/$DENO_DIR/deno
+  export QUARTO_DENO=$SCRIPT_PATH/../dist/bin/tools/$DENO_ARCH_DIR/deno
 fi
 
 export RUST_BACKTRACE=full