From 8b860ead6cda0c54b187b36c32ae9874eceaabdc Mon Sep 17 00:00:00 2001 From: Ammar Hussein Date: Fri, 22 Nov 2024 17:57:17 -0800 Subject: [PATCH] look for ggrep if grep version is BSD --- abra.sh | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/abra.sh b/abra.sh index b882032..5f34502 100644 --- a/abra.sh +++ b/abra.sh @@ -1,6 +1,18 @@ export ENTRYPOINT_CONF_VERSION=v5 export ENTRYPOINT_STREAMING_CONF_VERSION=v1 +grep=grep +if ! $grep -P --version 2>/dev/null 1>/dev/null +then + echo "$grep doesn't have -P option, trying ggrep" + grep=ggrep + if ! $grep -P --version 2>/dev/null 1>/dev/null + then + echo "If you're on a mac try running \`brew install grep\`" + exit 1 + fi +fi + file_env() { local var="$1" local fileVar="${var}_FILE" @@ -86,8 +98,8 @@ secrets() { bundle exec rake mastodon:webpush:generate_vapid_key \ > /tmp/key.txt - VAPID_PRIVATE_KEY=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "/tmp/key.txt") - VAPID_PUBLIC_KEY=$(grep -oP "VAPID_PUBLIC_KEY=\K.+" "/tmp/key.txt") + VAPID_PRIVATE_KEY=$($grep -oP "VAPID_PRIVATE_KEY=\K.+" "/tmp/key.txt") + VAPID_PUBLIC_KEY=$($grep -oP "VAPID_PUBLIC_KEY=\K.+" "/tmp/key.txt") rm -rf /tmp/key.txt echo "VAPID_PUBLIC_KEY = $VAPID_PUBLIC_KEY" @@ -123,17 +135,17 @@ secrets_activerecord() { bundle exec rake db:encryption:init \ > /tmp/activerecord.txt - ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=$(grep ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY /tmp/activerecord.txt | cut -d'=' -f2) + ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=$($grep ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY /tmp/activerecord.txt | cut -d'=' -f2) abra app secret insert "$APP_NAME" active_record_encryption_deterministic_key v1 "$ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY" echo "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY = $ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY" echo "" - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=$(grep ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT /tmp/activerecord.txt | cut -d'=' -f2) + ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=$($grep ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT /tmp/activerecord.txt | cut -d'=' -f2) abra app secret insert "$APP_NAME" active_record_encryption_key_derivation_salt v1 "$ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT" echo "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT = $ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT" echo "" - ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=$(grep ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY /tmp/activerecord.txt | cut -d'=' -f2) + ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=$($grep ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY /tmp/activerecord.txt | cut -d'=' -f2) abra app secret insert "$APP_NAME" active_record_encryption_primary_key v1 "$ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY" echo "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY = $ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY" echo ""