Skip to content

Commit

Permalink
Fix issue running hats_shell command one level above purple-hats fold…
Browse files Browse the repository at this point in the history 
…er (#191)
  • Loading branch information
@younglim
younglim authored Sep 28, 2023
1 parent ca49184 commit ae2cad2
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 81 deletions.
1 change: 1 addition & 0 deletions scripts/hats_shell.command
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ if [[ $(uname -m) == 'arm64' ]]; then
/usr/sbin/softwareupdate --install-rosetta --agree-to-license
fi

echo "Switching to x86_64 shell"
arch -x86_64 $SHELL_NAME "$CURR_FOLDERNAME/hats_shell.sh" $SHELL_NAME

else
Expand Down
30 changes: 13 additions & 17 deletions scripts/hats_shell.sh
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ echo "hats Shell - Created By younglim - NO WARRANTY PROVIDED"
echo "================================================================"
echo ""

echo "Running as $(uname -m)"

CURR_FOLDERNAME=$(basename "$PWD")
if [[ $CURR_FOLDERNAME = "scripts" ]]; then
if [[ "$CURR_FOLDERNAME" = "scripts" ]]; then
cd ..
CURR_FOLDERNAME=$(basename "$PWD")
CURR_FOLDERNAME="$(basename "$PWD")"
fi

__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

# Get current shell command
SHELL_COMMAND=$(ps -o comm= -p $$)
SHELL_NAME="${SHELL_COMMAND#-}"
Expand All @@ -23,39 +23,35 @@ if [[ $(uname -m) == 'arm64' ]]; then
/usr/sbin/softwareupdate --install-rosetta --agree-to-license
fi

echo "Switching to x86_64 shell"
arch -x86_64 $SHELL_NAME "$0" "$@"

else

echo "INFO: Setting path to node for this session"
if [[ $(uname -m) == 'arm64' ]]; then
export PATH_TO_NODE="$(pwd)/nodejs-mac-arm64/bin"
export PATH="$PATH_TO_NODE:$PATH"
else
export PATH_TO_NODE="$(pwd)/nodejs-mac-x64/bin"
export PATH="$PATH_TO_NODE:$PATH"
fi
export PATH_TO_NODE="$__dir/nodejs-mac-x64/bin"
export PATH="$PATH_TO_NODE:$PATH"

echo "INFO: Set path to node_modules for this session"
if find ./purple-hats -name "node_modules" -maxdepth 1 -type l -ls &> /dev/null; then
export PATH="$PWD/purple-hats/node_modules/.bin:$PATH"
export PATH="$__dir/purple-hats/node_modules/.bin:$PATH"
else
export PATH="$PWD/node_modules/.bin:$PATH"
export PATH="$__dir/node_modules/.bin:$PATH"
fi

echo "INFO: Set path to Java JRE"
export JAVA_HOME="$(PWD)/jre"
export JAVA_HOME="$__dir/jre"
export PATH="$JAVA_HOME/bin:$PATH"

echo "INFO: Set path to VeraPDF"
export PATH="$PWD/verapdf:$PATH"
export PATH="$__dir/verapdf:$PATH"

echo "INFO: Set path to Playwright cache for this session"
export PLAYWRIGHT_BROWSERS_PATH="$PWD/ms-playwright"
export PLAYWRIGHT_BROWSERS_PATH="$__dir/ms-playwright"
export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD="true"

echo "INFO: Removing com.apple.quarantine attributes for required binaries to run"
xattr -rd com.apple.quarantine . &>/dev/null

$@
eval "$1"
fi
137 changes: 73 additions & 64 deletions scripts/install_purple_dependencies.command
View file
Original file line number Diff line number Diff line change
@@ -1,79 +1,88 @@
#!/bin/bash

cd "$(dirname "${BASH_SOURCE[0]}")"
__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
# Get current shell command
SHELL_COMMAND=$(ps -o comm= -p $$)
SHELL_NAME="${SHELL_COMMAND#-}"

CURR_FOLDERNAME=$(basename "$PWD")
if [ $CURR_FOLDERNAME = "scripts" ]; then
cd ..
CURR_FOLDERNAME="$(basename "$PWD")"
fi

PROJECT_DIR="$PWD"

if ! [ -f nodejs-mac-x64/bin/node ]; then
echo "Downloading NodeJS LTS (x64)"
curl -o ./nodejs-mac-x64.tar.gz --create-dirs https://nodejs.org/dist/v18.18.0/node-v18.18.0-darwin-x64.tar.gz
mkdir nodejs-mac-x64 && tar -xzf nodejs-mac-x64.tar.gz -C nodejs-mac-x64 --strip-components=1 && rm ./nodejs-mac-x64.tar.gz
rm node-*-darwin-x64.tar.gz
fi

export CORRETTO_BASEDIR="$HOME/Library/Application Support/Purple HATS"
mkdir -p "$CORRETTO_BASEDIR"

if ! [ -f jre/bin/java ]; then
cd "$CORRETTO_BASEDIR"
if ! [ -f amazon-corretto-11.jdk.x64/Contents/Home/bin/java ]; then
echo "Downloading Corretto (x64)"
curl -L -o ./corretto-11.tar.gz "https://corretto.aws/downloads/latest/amazon-corretto-11-x64-macos-jdk.tar.gz"
tar -zxf ./corretto-11.tar.gz
rm -f ./corretto-11.tar.gz
mv amazon-corretto-11.jdk amazon-corretto-11.jdk.x64
else
echo "Found Corretto (x64)"
fi

echo "INFO: Set path to Corretto-11 JDK"
export JAVA_HOME="$CORRETTO_BASEDIR/amazon-corretto-11.jdk.x64/Contents/Home"
export PATH="$JAVA_HOME/bin:$PATH"
if [[ $(uname -m) == 'arm64' ]]; then
export ROSETTA2_STATUS_RESULT=$(/usr/bin/pgrep -q oahd && echo true || echo false)
if ! $ROSETTA2_STATUS_RESULT; then
echo "Installing Rosetta 2 dependency"
/usr/sbin/softwareupdate --install-rosetta --agree-to-license
fi

echo "INFO: Build JRE SE"
cd "$PROJECT_DIR"
jlink --output jre --add-modules java.se
echo "Switching to x86_64 shell"
arch -x86_64 $SHELL_NAME "$0" "$@"

fi
else
cd "$(dirname "${BASH_SOURCE[0]}")"
__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

if ! [ -f verapdf/verapdf ]; then
echo "Downloading VeraPDF"
if [ -d "./verapdf" ]; then rm -Rf ./verapdf; fi
if [ -d "./verapdf-installer" ]; then rm -Rf ./verapdf-installer; fi
curl -L -o ./verapdf-installer.zip http://downloads.verapdf.org/rel/verapdf-installer.zip
unzip -j ./verapdf-installer.zip -d ./verapdf-installer
./verapdf-installer/verapdf-install "${__dir}/verapdf-auto-install-macos.xml"
cp -r /tmp/verapdf .
rm -rf ./verapdf-installer.zip ./verapdf-installer /tmp/verapdf

fi

if [ -d "/Applications/Cloudflare WARP.app" ]; then
curl -sSLJ -o "/tmp/Cloudflare_CA.pem" "https://developers.cloudflare.com/cloudflare-one/static/documentation/connections/Cloudflare_CA.pem"
export NODE_EXTRA_CA_CERTS="/tmp/Cloudflare_CA.pem"
fi
CURR_FOLDERNAME="$(basename "$PWD")"
if [ "$CURR_FOLDERNAME" = "scripts" ]; then
cd ..
CURR_FOLDERNAME="$(basename "$PWD")"
fi

if ! [ -f package.json ] && [ -d purple-hats ]; then
cd purple-hats
fi
if ! [ -f nodejs-mac-x64/bin/node ]; then
echo "Downloading NodeJS LTS (x64)"
curl -o ./nodejs-mac-x64.tar.gz --create-dirs https://nodejs.org/dist/v18.18.0/node-v18.18.0-darwin-x64.tar.gz
mkdir nodejs-mac-x64 && tar -xzf nodejs-mac-x64.tar.gz -C nodejs-mac-x64 --strip-components=1 && rm ./nodejs-mac-x64.tar.gz
rm node-*-darwin-x64.tar.gz
fi

if [ -d "node_modules" ]; then
echo "Deleting node_modules before installation"
rm -rf node_modules
fi
export CORRETTO_BASEDIR="$HOME/Library/Application Support/Purple HATS"
mkdir -p "$CORRETTO_BASEDIR"

if ! [ -f jre/bin/java ]; then
cd "$CORRETTO_BASEDIR"
if ! [ -f amazon-corretto-11.jdk.x64/Contents/Home/bin/java ]; then
echo "Downloading Corretto (x64)"
curl -L -o ./corretto-11.tar.gz "https://corretto.aws/downloads/latest/amazon-corretto-11-x64-macos-jdk.tar.gz"
tar -zxf ./corretto-11.tar.gz
rm -f ./corretto-11.tar.gz
mv amazon-corretto-11.jdk amazon-corretto-11.jdk.x64
else
echo "Found Corretto (x64)"
fi

echo "INFO: Set path to Corretto-11 JDK"
export JAVA_HOME="$CORRETTO_BASEDIR/amazon-corretto-11.jdk.x64/Contents/Home"
export PATH="$JAVA_HOME/bin:$PATH"

echo "INFO: Build JRE SE"
cd "$__dir"
jlink --output jre --add-modules java.se

echo "Installing Node dependencies to $PWD and Installing Playwright browsers"
source "${__dir}/hats_shell.sh" npm ci --force; npx playwright install webkit
fi

if ! [ -f verapdf/verapdf ]; then
echo "Downloading VeraPDF"
if [ -d "./verapdf" ]; then rm -Rf ./verapdf; fi
if [ -d "./verapdf-installer" ]; then rm -Rf ./verapdf-installer; fi
curl -L -o ./verapdf-installer.zip http://downloads.verapdf.org/rel/verapdf-installer.zip
unzip -j ./verapdf-installer.zip -d ./verapdf-installer
./verapdf-installer/verapdf-install "${__dir}/verapdf-auto-install-macos.xml"
cp -r /tmp/verapdf .
rm -rf ./verapdf-installer.zip ./verapdf-installer /tmp/verapdf

fi

if [ -d "/Applications/Cloudflare WARP.app" ]; then
curl -sSLJ -o "/tmp/Cloudflare_CA.pem" "https://developers.cloudflare.com/cloudflare-one/static/documentation/connections/Cloudflare_CA.pem"
export NODE_EXTRA_CA_CERTS="/tmp/Cloudflare_CA.pem"
fi

if ! [ -f package.json ] && [ -d purple-hats ]; then
cd purple-hats
fi

if [ -d "node_modules" ]; then
echo "Deleting node_modules before installation"
rm -rf node_modules
fi

echo "Installing Node dependencies to $PWD and Installing Playwright browsers"
"${__dir}/hats_shell.sh" 'npm ci --force; npx playwright install;'

fi

0 comments on commit ae2cad2

Please sign in to comment.