fix: paths broken in 1.1.4

Author: bf4

bin/compile

@@ -34,8 +34,26 @@ trap 'finish_error $LINENO' ERR
 
 logstamp() { printf "[%s]" "$(TZ='America/Chicago' date +'%Y-%m-%d %H:%M:%S')" ; }
 topic()    { echo "-----> $(logstamp) $*" ; }
-info()    { echo "       $*" ; }
-indent()  { sed -u 's/^/       /' ; } # it always runs on linux. on darwin is 'sed -l'
+info()     { echo "       $*" ; }
+HEROKU_FREETDS_BUILDPACK_DEBUG="${HEROKU_FREETDS_BUILDPACK_DEBUG:-false}"
+debug()   {
+  if [ "$HEROKU_FREETDS_BUILDPACK_DEBUG" = "true" ]; then
+    echo "[DEBUG] $*"
+  fi
+}
+debug_topic() {
+  if [ "$HEROKU_FREETDS_BUILDPACK_DEBUG" = "true" ]; then
+    echo "[DEBUG] -----> $*"
+  fi
+}
+error()    { echo " !     $*" ;  >&2 exit 1  ; }
+indent() {
+  local command; command='s/^/       /'
+  case $(uname) in
+    Darwin) sed -l "$command";;
+    *)      sed -u "$command";;
+  esac
+}
 
 BUILD_DIR="$1"
 CACHE_DIR="$2"
@@ -46,11 +64,21 @@ ENV_DIR="${3}"
 # echo "$SOURCE_VERSION"
 # See https://devcenter.heroku.com/articles/buildpack-api#bin-compile-summary
 
+# Store which STACK we are running on in the cache to bust the cache if it changes
+if [ -f "${CACHE_DIR}/.freetds/STACK" ]; then
+  CACHED_STACK=$(cat "$CACHE_DIR/.freetds/STACK")
+else
+  CACHED_STACK=$STACK
+fi
+# Ensure we store the STACK in the cache for next time.
+mkdir -p "$CACHE_DIR/.freetds"
+echo "$STACK" > "$CACHE_DIR/.freetds/STACK"
+
 BIN_DIR="$(cd "$(dirname "$0")"; pwd)" # absolute path
 LP_DIR="$(cd "$(dirname "$0")"; cd ..; pwd)"
 ROOT_DIR="$(dirname "$BIN_DIR")"
 
-info "BIN_DIR=${BIN_DIR}, ROOT_DIR=${ROOT_DIR}, BUILD_DIR=${BUILD_DIR}, CACHE_DIR=${CACHE_DIR}, pwd=$(pwd)"
+info "BIN_DIR=${BIN_DIR}, ROOT_DIR=${ROOT_DIR}, BUILD_DIR=${BUILD_DIR}, CACHE_DIR=${CACHE_DIR}, STACK=${STACK} CACHED_STACK=${CACHED_STACK} pwd=$(pwd)"
 
 load_env_vars() {
   local env_var; env_var="${1:-}"
@@ -63,18 +91,26 @@ FREETDS_ARCHIVE_NAME="${FREETDS_ARCHIVE_NAME:-freetds-${FREETDS_VERSION}}"
 TDS_VERSION="${TDS_VERSION:-7.3}" # or TDSVER
 USE_GNUTLS="${USE_GNUTLS:---with-gnutls}"
 
-CACHED_TAR="${CACHE_DIR}/freetds-${FREETDS_VERSION}-heroku.tar.bz2"
-# Default rebuild to true since I'm having issues linking the library to tiny_tds gem with a cached build.
-if [ "${FREETDS_REBUILD:-}" = "true" ]; then
+FREETDS_CACHE_DIR="$CACHE_DIR"
+mkdir -p "${FREETDS_CACHE_DIR}"
+CACHED_TAR="${FREETDS_CACHE_DIR}/freetds-${FREETDS_VERSION}-heroku.tar.bz2"
+if [ "$CACHED_STACK" != "$STACK" ] ; then
+  topic "Stack has changed. Clearing cache"
+  rm -f "$CACHED_TAR"
+elif [ "${FREETDS_REBUILD:-}" = "true" ]; then
+  # Default rebuild to true since I'm having issues linking the library to tiny_tds gem with a cached build.
+  topic "FREETDS_REBUILD is true. Clearing cache"
   rm -f "$CACHED_TAR"
 fi
 # This installation target is in the BUILD_DIR, which means that
 # it'll end up in the slug at runtime.
-BUILD_TARGET_DIR="${BUILD_DIR}/freetds"
+# Assert $BUILD_TARGET_DIR = $HOME/freetds | $BUILD_DIR/freetds # /app/freetds
+BUILD_TARGET_DIR="${BUILD_DIR}/freetds" # /app/freetds
 mkdir -p "${BUILD_TARGET_DIR}"
 
 # This is the path that will be used at dyno runtime, and in which we build.
-APP_TARGET_DIR="/app/freetds"
+# Assert $APP_TARGET_DIR = $HOME/freetds # /app/freetds
+APP_TARGET_DIR="${HOME:-app}/freetds"
 mkdir -p "${APP_TARGET_DIR}"
 
 configure_app_env_vars() {
@@ -83,46 +119,55 @@ configure_app_env_vars() {
 
   # These exports must point to /app, because the profile is
   # executed in a running dyno, not the buildpack environment
+  # Assert $APP_TARGET_DIR = $HOME/freetds # /app/freetds
   cat <<EOF > "${BUILD_DIR}/.profile.d/freetds.sh"
-  export PATH="${APP_TARGET_DIR}/bin:\$PATH"
+  export PATH="\${HOME}/freetds/bin:\$PATH"
   # tiny_tds extconf.rb uses FREETDS_DIR
   # https://github.com/rails-sqlserver/tiny_tds/blob/5046755ca91594003f8b3ca541d136f3ed859973/ext/tiny_tds/extconf.rb#L36-L38
-  export FREETDS_DIR="${APP_TARGET_DIR}"
-  export LD_LIBRARY_PATH="${APP_TARGET_DIR}/lib:${LD_LIBRARY_PATH:-/usr/local/lib}"
-  export LD_RUN_PATH="${APP_TARGET_DIR}/lib:${LD_RUN_PATH:-/usr/local/lib}"
-  export LIBRARY_PATH="${APP_TARGET_DIR}/lib:${LIBRARY_PATH:-/usr/local/lib}"
-  export SYBASE="${APP_TARGET_DIR}"
+  export FREETDS_DIR="\${HOME}/freetds"
+  export LD_LIBRARY_PATH="\${HOME}/freetds/lib:\${LD_LIBRARY_PATH:-/usr/local/lib}"
+  export LD_RUN_PATH="\${HOME}/freetds/lib:\${LD_RUN_PATH:-/usr/local/lib}"
+  export LIBRARY_PATH="\${HOME}/freetds/lib:\${LIBRARY_PATH:-/usr/local/lib}"
+  export SYBASE="\${HOME}/freetds"
 EOF
  chmod +x "${BUILD_DIR}/.profile.d/freetds.sh"
  echo "configured APP env vars:" | indent
  indent < "${BUILD_DIR}/.profile.d/freetds.sh"
- # shellcheck disable=SC1090
+ # shellcheck disable=SC1091
  . "${BUILD_DIR}/.profile.d/freetds.sh"
 }
 
 configure_buildpack_env_vars() {
   # These exports point to the build directory, not to /app, so that
   # they work for later buildpacks.
+  # Assert $BUILD_TARGET_DIR = $HOME/freetds | $BUILD_DIR/freetds # /app/freetds
   export PATH="${BUILD_TARGET_DIR}/bin:$PATH"
   export FREETDS_DIR="${BUILD_TARGET_DIR}"
   export LD_LIBRARY_PATH="${BUILD_TARGET_DIR}/lib:${LD_LIBRARY_PATH:-/usr/local/lib}"
   export LD_RUN_PATH="${BUILD_TARGET_DIR}/lib:${LD_RUN_PATH:-/usr/local/lib}"
   export LIBRARY_PATH="${BUILD_TARGET_DIR}/lib:${LIBRARY_PATH:-/usr/local/lib}"
+  # Assert $APP_TARGET_DIR = $HOME/freetds # /app/freetds
   export SYBASE="${APP_TARGET_DIR}"
   # give environment to later buildpacks
-  export | grep -E -e ' (PATH|LD_LIBRARY_PATH|LIBRARY_PATH|FREETDS_DIR|SYBASE)=' > "${LP_DIR}/export"
+  export | grep -E -e ' (PATH|LD_LIBRARY_PATH|LD_RUN_PATH|LIBRARY_PATH|FREETDS_DIR|SYBASE)=' > "${LP_DIR}/export"
 
   echo "configured BUILDPACK env vars:" | indent
   indent < "${LP_DIR}/export"
+
+  topic "Rewrite package-config files"
+  # shellcheck disable=SC2038
+  find "$BUILD_DIR/freetds" -type f -ipath '*/pkgconfig/*.pc' | xargs --no-run-if-empty -n 1 sed -i -e 's!^prefix=\(.*\)$!prefix='"$BUILD_DIR"'/freetds\1!g'
 }
 
 download_and_extract_freetds_archive() {
   FREETDS_FILE="$FREETDS_ARCHIVE_NAME.tar.gz"
   FREETDS_URL="https://www.freetds.org/files/stable/${FREETDS_FILE}"
-  # TODO(BF): Print log when HEROKUR_FREETDS_BUILDPACK_DEBUG is set
   # TODO(BF): Consider calculating and verifying SHA256: openssl dgst -sha256 < "$FREETDS_FILE"
   curl -s "$FREETDS_URL" | tar xzvf - -C "${BUILD_DIR}" > "${BUILD_DIR}/build_log-unpack.log" # Can't write to the archive dir until it exists
   mv "${BUILD_DIR}/build_log-unpack.log" "${BUILD_DIR}/${FREETDS_ARCHIVE_NAME}/"
+  if [ "$HEROKU_FREETDS_BUILDPACK_DEBUG" = "true" ]; then
+    debug "$(cat "${BUILD_DIR}/build_log-unpack.log")"
+  fi
 }
 
 build_and_install_freetds() {
@@ -152,13 +197,20 @@ build_and_install_freetds() {
       --disable-debug \
       "--with-tdsver=${TDS_VERSION}"
 EOF
-    # TODO(BF): Print log when HEROKUR_FREETDS_BUILDPACK_DEBUG is set
     /bin/bash .build_options > build_log-configure.stdout.log 2> build_log-configure.stderr.log
+    if [ "$HEROKU_FREETDS_BUILDPACK_DEBUG" = "true" ]; then
+      debug "$(cat .build_options)"
+      debug "$(cat build_log-configure.stdout.log)"
+      debug "$(cat build_log-configure.stderr.log)"
+    fi
     # Flush make output to log since a file will be faster than printing to the screen.
-    # TODO(BF): Print log when HEROKUR_FREETDS_BUILDPACK_DEBUG is set
     {
       make && make install && make clean
     } > build_log-make_install.stdout.log 2> build_log-make_install.stderr.log
+    if [ "$HEROKU_FREETDS_BUILDPACK_DEBUG" = "true" ]; then
+      debug "$(cat build_log-make_install.stdout.log)"
+      debug "$(cat build_log-make_install.stderr.log)"
+    fi
     cp .build_options build_log-* "${APP_TARGET_DIR}/"
 
     cd "$BUILD_DIR"