Merge branch 'develop' into FOGL-6315

Author: YashTatkondawar

plugins/make_deb

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ##--------------------------------------------------------------------
-## Copyright (c) 2019 Dianomic Systems Inc.
+## Copyright (c) 2022 Dianomic Systems Inc.
 ##
 ## Licensed under the Apache License, Version 2.0 (the "License");
 ## you may not use this file except in compliance with the License.
@@ -188,6 +188,7 @@ do
     sed -i "s/fledge$/fledge (${fledge_version})/" ${deb_path}/control
     sed -i "s|__INSTALL_DIR__|${installs}|g" ${deb_path}/postinst
     sed -i "s/__PLUGIN_NAME__/${plugin_name}/g" ${deb_path}/postinst
+    sed -i "s/__PLUGIN_TYPE__/${plugin_type_install}/g" ${deb_path}/postinst
     desc=`cat "${GIT_ROOT}/Description"`
     sed -i "s/__DESCRIPTION__/${desc}/g" ${deb_path}/control
     if [ ! -z "${service_notification_version}" ] ; then
@@ -232,6 +233,10 @@ EOF
         fi
         # plugin info version replaced in ${plugin_name}.py
         sed -i "s/'version':.*$/'version': '${version}',/g" ${GIT_ROOT}/python/fledge/plugins/${plugin_type}/${plugin_name}/${plugin_name}.py
+        # Move python requirements to the plugin installed directory
+        if [ -f "${GIT_ROOT}/python/requirements-${plugin_name}.txt" ]; then
+            mv ${GIT_ROOT}/python/requirements-${plugin_name}.txt ${GIT_ROOT}/${installs}/requirements.txt
+        fi
         cp -R ${GIT_ROOT}/python .
         cp -R ${GIT_ROOT}/VERSION.${plugin_type}.${plugin_name} ./python/fledge/plugins/${plugin_type}/${plugin_name}
     else

plugins/make_rpm

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ##--------------------------------------------------------------------
-## Copyright (c) 2019 Dianomic Systems
+## Copyright (c) 2022 Dianomic Systems Inc.
 ##
 ## Licensed under the Apache License, Version 2.0 (the "License");
 ## you may not use this file except in compliance with the License.
@@ -196,6 +196,7 @@ do
   sed -i "s/__RELEASE__/${commit_count}/g" SPECS/plugin.spec
 	sed -i "s/__NAME__/${pkg_name}/g" SPECS/plugin.spec
 	sed -i "s/__PLUGIN_NAME__/${plugin_name}/g" SPECS/plugin.spec
+	sed -i "s/__PLUGIN_TYPE__/${plugin_type_install}/g" SPECS/plugin.spec
 	sed -i "s/__ARCH__/${arch}/g" SPECS/plugin.spec
 	sed -i "s/__PACKAGE_NAME__/${package_name}/g" SPECS/plugin.spec
 	sed -i "s|__INSTALL_DIR__|${installs}|g" SPECS/plugin.spec
@@ -241,6 +242,10 @@ EOF
 	    fi
 	    # plugin info version replaced in ${plugin_name}.py
 	    sed -i "s/'version':.*$/'version': '${version}',/g" ${GIT_ROOT}/python/fledge/plugins/${plugin_type}/${plugin_name}/${plugin_name}.py
+	    # Move python requirements to the plugin installed directory
+	    if [ -f "${GIT_ROOT}/python/requirements-${plugin_name}.txt" ]; then
+	        mv ${GIT_ROOT}/python/requirements-${plugin_name}.txt ${GIT_ROOT}/${installs}/requirements.txt
+	    fi
 	    cp -R ${GIT_ROOT}/python .
 	    cp -R ${GIT_ROOT}/VERSION.${plugin_type}.${plugin_name} ./python/fledge/plugins/${plugin_type}/${plugin_name}
 	else

plugins/packages/DEBIAN/postinst

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ##--------------------------------------------------------------------
-## Copyright (c) 2019 Dianomic Systems Inc.
+## Copyright (c) 2022 Dianomic Systems Inc.
 ##
 ## Licensed under the Apache License, Version 2.0 (the "License");
 ## you may not use this file except in compliance with the License.
@@ -38,12 +38,11 @@ if [ -f /usr/local/fledge/python/extras_install___PLUGIN_NAME__.sh ]; then
    sh /usr/local/fledge/python/extras_install___PLUGIN_NAME__.sh
 fi
 
-# Install Python dependencies; if any
-if [ -f /usr/local/fledge/python/requirements-__PLUGIN_NAME__.txt ]; then
-    pip3 install -Ir /usr/local/fledge/python/requirements-__PLUGIN_NAME__.txt
+# Install Python pip dependencies; if any
+if [ -f /usr/local/fledge/__INSTALL_DIR__/requirements.txt ]; then
+    pip3 install -Ir /usr/local/fledge/__INSTALL_DIR__/requirements.txt
 fi
-
-echo __PLUGIN_NAME__ plugin is installed.
+echo __PLUGIN_NAME__ __PLUGIN_TYPE__ plugin is installed.
 echo "
 __PLUGIN_NOTES__
 "

plugins/packages/RPM/SPECS/plugin.spec

@@ -25,7 +25,7 @@ __DESCRIPTION__
 #!/usr/bin/env bash
 
 ##--------------------------------------------------------------------
-## Copyright (c) 2019 Dianomic Systems Inc.
+## Copyright (c) 2022 Dianomic Systems Inc.
 ##
 ## Licensed under the Apache License, Version 2.0 (the "License");
 ## you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ __DESCRIPTION__
 #!/usr/bin/env bash
 
 ##--------------------------------------------------------------------
-## Copyright (c) 2019 Dianomic Systems Inc.
+## Copyright (c) 2022 Dianomic Systems Inc.
 ##
 ## Licensed under the Apache License, Version 2.0 (the "License");
 ## you may not use this file except in compliance with the License.
@@ -87,7 +87,7 @@ PKG_NAME="__PACKAGE_NAME__"
 #!/usr/bin/env bash
 
 ##--------------------------------------------------------------------
-## Copyright (c) 2019 Dianomic Systems Inc.
+## Copyright (c) 2022 Dianomic Systems Inc.
 ##
 ## Licensed under the Apache License, Version 2.0 (the "License");
 ## you may not use this file except in compliance with the License.
@@ -128,11 +128,13 @@ if [ -f /usr/local/fledge/python/extras_install___PLUGIN_NAME__.sh ]; then
 fi
 
 # Install any Python dependencies
-if [ -f /usr/local/fledge/python/requirements-__PLUGIN_NAME__.txt ]; then
+if [ -f /usr/local/fledge/__INSTALL_DIR__/requirements.txt ]; then
 	bash << EOF
 scl enable rh-python36 bash
-pip install -Ir /usr/local/fledge/python/requirements-__PLUGIN_NAME__.txt
+pip install -Ir /usr/local/fledge/__INSTALL_DIR__/requirements.txt
 EOF
 fi
 
+echo __PLUGIN_NAME__ __PLUGIN_TYPE__ plugin is installed.
+
 %files