improve license handling

This commit is contained in:
Rodolfo Berrios
2024-02-15 11:18:24 -03:00
parent e8b4fc043d
commit 5e00e48e1f
2 changed files with 14 additions and 8 deletions

View File

@@ -5,6 +5,7 @@ DOMAIN ?= localhost
NAMESPACE ?= chevereto
NAMESPACE_FILE = ./namespace/${NAMESPACE}
NAMESPACE_FILE_EXISTS = false
CHEVERETO_LICENSE_KEY ?= ""
ifneq ("$(wildcard ${NAMESPACE_FILE})","")
NAMESPACE_FILE_EXISTS = true
include ${NAMESPACE_FILE}
@@ -18,7 +19,7 @@ SOURCE ?= ~/git/chevereto/v4
TARGET ?= default# default|dev
VERSION ?= 4.0
PHP ?= 8.2
EDITION ?= pro
EDITION ?= $(shell [ "${CHEVERETO_LICENSE_KEY}" = "" ] && echo free || echo pro)
DOCKER_USER ?= www-data
HOSTNAME ?= localhost
HOSTNAME_PATH ?= /
@@ -47,7 +48,7 @@ COMPOSE_SAMPLE = $(shell [ "${TARGET}" = "default" ] && echo default || echo dev
COMPOSE_FILE = $(shell [ -f \${COMPOSE_TARGET} ] && echo \${COMPOSE_TARGET} || echo \${COMPOSE_SAMPLE})
FEEDBACK = $(shell echo 👉 \${TARGET} \${CONTAINER_BASENAME} @\${NAMESPACE_FILE} V\${VERSION} \(\${DOCKER_USER}\))
FEEDBACK_SHORT = $(shell echo 👉 \${TARGET} V\${VERSION} \(\${DOCKER_USER}\))
CHEVERETO_LICENSE ?= $(shell stty -echo; read -p "Chevereto V4 License key (if any): 🔑" license; stty echo; echo $$license)
CHEVERETO_LICENSE ?= $(shell stty -echo; read -p "Chevereto V4 License key (for paid edition): 🔑" license; stty echo; echo $$license)
DOCKER_COMPOSE = $(shell echo @CONTAINER_BASENAME=\${CONTAINER_BASENAME} \
SOURCE=\${SOURCE} \
DB_PORT=\${DB_PORT} \
@@ -94,7 +95,7 @@ feedback--namespace:
# Docker
image: feedback--image feedback--short
@CHEVERETO_LICENSE=${CHEVERETO_LICENSE} \
@CHEVERETO_LICENSE_KEY=${CHEVERETO_LICENSE_KEY} \
VERSION=${VERSION} \
IMAGE_NAME=${IMAGE_NAME} \
./scripts/system/chevereto.sh \

View File

@@ -3,21 +3,26 @@ set -e
DOWNLOAD_DIR=${PWD}"/.temp"
WORKING_DIR=${PWD}"/chevereto"
PACKAGE=${VERSION}
if [ -z ${CHEVERETO_LICENSE} ]; then
echo -n "Chevereto V4 License key (if any): 🔑"
read -s CHEVERETO_LICENSE
if [ -z ${CHEVERETO_LICENSE_KEY+x} ]; then
echo -n "Chevereto V4 License key (for paid edition): 🔑"
read -s CHEVERETO_LICENSE_KEY
echo ""
fi
API_DOWNLOAD="https://chevereto.com/api/download/"
if [ -z ${CHEVERETO_LICENSE_KEY} ]; then
DOWNLOADING="FREE"
else
DOWNLOADING="PAID"
fi
echo " ..."
echo "* Downloading Chevereto"
echo "* NOTE: Using [[ ${DOWNLOADING} ]] edition package"
rm -rf $DOWNLOAD_DIR $WORKING_DIR
mkdir -p $DOWNLOAD_DIR $WORKING_DIR
echo "* Downloading chevereto/v4 $PACKAGE package"
echo "> ${API_DOWNLOAD}${PACKAGE}"
cd $DOWNLOAD_DIR
curl -f -SOJL \
-H "License: $CHEVERETO_LICENSE" \
-H "License: $CHEVERETO_LICENSE_KEY" \
"${API_DOWNLOAD}${PACKAGE}"
ZIP_NAME=$(basename *.zip)
echo "* Extracting ${ZIP_NAME} package"