fix,minor: safely handle env vars

This commit is contained in:
FMotalleb
2024-10-31 14:01:46 +03:30
parent 0242f4f4d4
commit 67979fa1ac

46
make.sh
View File

@@ -35,9 +35,9 @@ done <<< "$RB_GEM_LIST_OUTPUT"
echo "[*] gitlab-license version: $RB_GEM_VERSION" echo "[*] gitlab-license version: $RB_GEM_VERSION"
RB_GEM_DOWNLOAD_URL="https://rubygems.org/downloads/gitlab-license-$RB_GEM_VERSION.gem" RB_GEM_DOWNLOAD_URL="https://rubygems.org/downloads/gitlab-license-$RB_GEM_VERSION.gem"
RB_GEM_DOWNLOAD_PATH=$(pwd)/temp/gem/gitlab-license.gem RB_GEM_DOWNLOAD_PATH=$(pwd)/temp/gem/gitlab-license.gem
mkdir -p $(dirname $RB_GEM_DOWNLOAD_PATH) mkdir -p "$(dirname "$RB_GEM_DOWNLOAD_PATH")"
curl -L $RB_GEM_DOWNLOAD_URL -o $RB_GEM_DOWNLOAD_PATH 1> /dev/null 2> /dev/null curl -L "$RB_GEM_DOWNLOAD_URL" -o "$RB_GEM_DOWNLOAD_PATH" 1>/dev/null 2>/dev/null
pushd $(dirname $RB_GEM_DOWNLOAD_PATH) > /dev/null pushd "$(dirname "$RB_GEM_DOWNLOAD_PATH")" >/dev/null
tar -xf gitlab-license.gem tar -xf gitlab-license.gem
tar -xf data.tar.gz tar -xf data.tar.gz
@@ -47,9 +47,9 @@ if [ ! -f "./lib/gitlab/license.rb" ]; then
fi fi
echo "[*] copying gem..." echo "[*] copying gem..."
rm -rf "$WORKING_DIR/lib" || true rm -rf "${WORKING_DIR:?}/lib" || true
mkdir -p "$WORKING_DIR/lib" mkdir -p "$WORKING_DIR/lib"
cp -r ./lib/gitlab/* $WORKING_DIR/lib cp -r ./lib/gitlab/* "$WORKING_DIR/lib"
popd >/dev/null popd >/dev/null
pushd lib >/dev/null pushd lib >/dev/null
@@ -60,16 +60,19 @@ OS_TYPE="$(uname -s)"
case "$OS_TYPE" in case "$OS_TYPE" in
Linux*) Linux*)
sed_i_cmd="sed -i";; sed_i_cmd="sed -i"
;;
Darwin*) Darwin*)
sed_i_cmd="sed -i ''";; sed_i_cmd="sed -i ''"
;;
*) *)
echo "Unsupported OS: $OS_TYPE"; echo "Unsupported OS: $OS_TYPE"
exit 1;; exit 1
;;
esac esac
# replace `require 'gitlab/license/` with `require 'license/` to make it work # replace `require 'gitlab/license/` with `require 'license/` to make it work
find . -type f -exec $sed_i_cmd 's/require '\''gitlab\/license\//require_relative '\''license\//g' {} \; find . -type f -exec "$sed_i_cmd" 's/require '\''gitlab\/license\//require_relative '\''license\//g' {} \;
popd >/dev/null popd >/dev/null
@@ -82,22 +85,21 @@ mkdir -p "$GITLAB_SOURCE_CODE_DIR"
echo "[*] downloading features file..." echo "[*] downloading features file..."
curl -L https://gitlab.com/gitlab-org/gitlab/-/raw/master/ee/app/models/gitlab_subscriptions/features.rb?inline=false -o "$GITLAB_SOURCE_CODE_DIR/features.rb" curl -L https://gitlab.com/gitlab-org/gitlab/-/raw/master/ee/app/models/gitlab_subscriptions/features.rb?inline=false -o "$GITLAB_SOURCE_CODE_DIR/features.rb"
BUILD_DIR=$(pwd)/build BUILD_DIR=$(pwd)/build
mkdir -p $BUILD_DIR mkdir -p "$BUILD_DIR"
echo "[*] scanning features..." echo "[*] scanning features..."
FEATURE_LIST_FILE=$BUILD_DIR/features.json FEATURE_LIST_FILE=$BUILD_DIR/features.json
rm -f $FEATURE_LIST_FILE || true rm -f "${FEATURE_LIST_FILE:?}" || true
./src/scan.features.rb \ ./src/scan.features.rb \
-o $FEATURE_LIST_FILE \ -o "$FEATURE_LIST_FILE" \
-f "$GITLAB_SOURCE_CODE_DIR/features.rb" -f "$GITLAB_SOURCE_CODE_DIR/features.rb"
echo "[*] generating key pair..." echo "[*] generating key pair..."
PUBLIC_KEY_FILE=$BUILD_DIR/public.key PUBLIC_KEY_FILE=$BUILD_DIR/public.key
PRIVATE_KEY_FILE=$BUILD_DIR/private.key PRIVATE_KEY_FILE=$BUILD_DIR/private.key
cp -f ./keys/public.key $PUBLIC_KEY_FILE cp -f ./keys/public.key "$PUBLIC_KEY_FILE"
cp -f ./keys/private.key $PRIVATE_KEY_FILE cp -f ./keys/private.key "$PRIVATE_KEY_FILE"
# execute following command to generate new keys # execute following command to generate new keys
# ./src/generator.keys.rb \ # ./src/generator.keys.rb \
@@ -109,16 +111,16 @@ LICENSE_FILE=$BUILD_DIR/result.gitlab-license
LICENSE_JSON_FILE=$BUILD_DIR/license.json LICENSE_JSON_FILE=$BUILD_DIR/license.json
./src/generator.license.rb \ ./src/generator.license.rb \
-f $FEATURE_LIST_FILE \ -f "$FEATURE_LIST_FILE" \
--public-key $PUBLIC_KEY_FILE \ --public-key "$PUBLIC_KEY_FILE" \
--private-key $PRIVATE_KEY_FILE \ --private-key "$PRIVATE_KEY_FILE" \
-o $LICENSE_FILE \ -o "$LICENSE_FILE" \
--license-name "$LICENSE_NAME" \ --license-name "$LICENSE_NAME" \
--license-company "$LICENSE_COMPANY" \ --license-company "$LICENSE_COMPANY" \
--license-email "$LICENSE_EMAIL" \ --license-email "$LICENSE_EMAIL" \
--license-plan "$LICENSE_PLAN" \ --license-plan "$LICENSE_PLAN" \
--license-user-count "$LICENSE_USER_COUNT" \ --license-user-count "$LICENSE_USER_COUNT" \
--license-expire-year "$LICENSE_EXPIRE_YEAR" \ --license-expire-year "$LICENSE_EXPIRE_YEAR" \
--plain-license $LICENSE_JSON_FILE --plain-license "$LICENSE_JSON_FILE"
echo "[*] done $(basename $0)" echo "[*] done $(basename "$0")"