From 458493141e7646f4c03c830993fafbb65e446d9e Mon Sep 17 00:00:00 2001 From: Stavros Kroustouris Date: Thu, 26 Nov 2020 12:59:19 +0100 Subject: [PATCH] remove obsolete check-licence --- CHANGELOG.rst | 5 +++++ st2common/bin/st2-check-license | 34 --------------------------------- st2common/setup.py | 1 - 3 files changed, 5 insertions(+), 35 deletions(-) delete mode 100755 st2common/bin/st2-check-license diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 675b6b48c4..6a867cf8e2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -27,6 +27,11 @@ Fixed Contributed by @guzzijones +Removed +~~~~~~~~ +* Removed check-licence script (cleanup) #5092 + Contributed by @kroustou + 3.3.0 - October 06, 2020 ------------------------ diff --git a/st2common/bin/st2-check-license b/st2common/bin/st2-check-license deleted file mode 100755 index e9d56e362f..0000000000 --- a/st2common/bin/st2-check-license +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -#!/usr/bin/env bash -# Licensed to the StackStorm, Inc ('StackStorm') under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -if [[ $# -eq 0 ]] ; then - echo "No license key entered" - echo "Usage: $0 " - exit 1 -fi - -LICENSE=$@ -BWC_LICENSE_CHECK_URL="https://${LICENSE}:@packagecloud.io/install/repositories/StackStorm/enterprise/script.deb.sh" -LICENSE_CURL_TEST=`curl --output /dev/null --silent --fail ${BWC_LICENSE_CHECK_URL}` - -if [ $? -ne 0 ]; then - echo -e "[x] License is not valid" - exit 2 -else - echo -e "[*] License is valid" - exit 0 -fi diff --git a/st2common/setup.py b/st2common/setup.py index b33a6f14c8..f68679af8c 100644 --- a/st2common/setup.py +++ b/st2common/setup.py @@ -57,7 +57,6 @@ 'bin/st2-self-check', 'bin/st2-track-result', 'bin/st2-validate-pack-config', - 'bin/st2-check-license', 'bin/st2-pack-install', 'bin/st2-pack-download', 'bin/st2-pack-setup-virtualenv'