From ca692192be1d8cae56ee280bd750770864c498ec Mon Sep 17 00:00:00 2001 From: Motalleb Fallahnezhad Date: Thu, 31 Oct 2024 08:56:23 +0000 Subject: [PATCH 1/3] fix: disable the need to download full gitlab source code during make.sh execution --- make.sh | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/make.sh b/make.sh index 5dd23d6..a7ca851 100755 --- a/make.sh +++ b/make.sh @@ -71,20 +71,13 @@ popd > /dev/null echo "[*] updated gem" echo "[*] fetching gitlab source code..." -GITLAB_SOURCE_CODE_DIR=$(pwd)/temp/src/ -if [ -d "$GITLAB_SOURCE_CODE_DIR" ]; then - echo "[*] gitlab source code already exists, skipping cloning..." -else - echo "[*] cloning gitlab source code..." - git clone https://gitlab.com/gitlab-org/gitlab.git $GITLAB_SOURCE_CODE_DIR -fi +GITLAB_SOURCE_CODE_DIR=$(pwd)/temp/src + +mkdir -p "$GITLAB_SOURCE_CODE_DIR" +chmod 0755 -R "$GITLAB_SOURCE_CODE_DIR" +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" -echo "[*] updating gitlab source code..." -pushd $GITLAB_SOURCE_CODE_DIR > /dev/null -git clean -fdx -f > /dev/null -git reset --hard > /dev/null -git pull > /dev/null -popd > /dev/null BUILD_DIR=$(pwd)/build mkdir -p $BUILD_DIR @@ -94,7 +87,7 @@ FEATURE_LIST_FILE=$BUILD_DIR/features.json rm -f $FEATURE_LIST_FILE || true ./src/scan.features.rb \ -o $FEATURE_LIST_FILE \ - -s $GITLAB_SOURCE_CODE_DIR + -f "$GITLAB_SOURCE_CODE_DIR/features.rb" echo "[*] generating key pair..." PUBLIC_KEY_FILE=$BUILD_DIR/public.key From 619994531240fd7ef783dafcafe66bf48d7938e2 Mon Sep 17 00:00:00 2001 From: Motalleb Fallahnezhad Date: Thu, 31 Oct 2024 09:04:02 +0000 Subject: [PATCH 2/3] feat: added envvars for optional fields in make.sh --- make.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/make.sh b/make.sh index a7ca851..de0991f 100755 --- a/make.sh +++ b/make.sh @@ -2,7 +2,12 @@ echo "[i] GitLab License Generator" echo "[i] Copyright (c) 2023 Tim Cook, All Rights Not Reserved" - +LICENSE_NAME="${LICENSE_NAME:-"Tim Cook"}" +LICENSE_COMPANY="${LICENSE_COMPANY:-"Apple Computer, Inc."}" +LICENSE_EMAIL="${LICENSE_EMAIL:-"tcook@apple.com"}" +LICENSE_PLAN="${LICENSE_PLAN:-'ultimate'}" +LICENSE_USER_COUNT="${LICENSE_USER_COUNT:-'2147483647'}" +LICENSE_EXPIRE_YEAR="${LICENSE_EXPIRE_YEAR:-'2500'}" set -e cd "$(dirname "$0")" @@ -109,6 +114,12 @@ LICENSE_JSON_FILE=$BUILD_DIR/license.json --public-key $PUBLIC_KEY_FILE \ --private-key $PRIVATE_KEY_FILE \ -o $LICENSE_FILE \ + --license-name "$LICENSE_NAME" \ + --license-company "$LICENSE_COMPANY" \ + --license-email "$LICENSE_EMAIL" \ + --license-plan "$LICENSE_PLAN" \ + --license-user-count "$LICENSE_USER_COUNT" \ + --license-expire-year "$LICENSE_EXPIRE_YEAR" \ --plain-license $LICENSE_JSON_FILE echo "[*] done $(basename $0)" From 0edb66ed69eaf08962b150569540444ee7d49954 Mon Sep 17 00:00:00 2001 From: Motalleb Fallahnezhad Date: Thu, 31 Oct 2024 09:06:23 +0000 Subject: [PATCH 3/3] fix: optional flag issue --- make.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make.sh b/make.sh index de0991f..75bcc9a 100755 --- a/make.sh +++ b/make.sh @@ -5,9 +5,9 @@ echo "[i] Copyright (c) 2023 Tim Cook, All Rights Not Reserved" LICENSE_NAME="${LICENSE_NAME:-"Tim Cook"}" LICENSE_COMPANY="${LICENSE_COMPANY:-"Apple Computer, Inc."}" LICENSE_EMAIL="${LICENSE_EMAIL:-"tcook@apple.com"}" -LICENSE_PLAN="${LICENSE_PLAN:-'ultimate'}" -LICENSE_USER_COUNT="${LICENSE_USER_COUNT:-'2147483647'}" -LICENSE_EXPIRE_YEAR="${LICENSE_EXPIRE_YEAR:-'2500'}" +LICENSE_PLAN="${LICENSE_PLAN:-ultimate}" +LICENSE_USER_COUNT="${LICENSE_USER_COUNT:-2147483647}" +LICENSE_EXPIRE_YEAR="${LICENSE_EXPIRE_YEAR:-2500}" set -e cd "$(dirname "$0")"