Merge pull request #64 from fledge-iot/2.0.0RC2

2.0.0RC2

Author: ashish-jabble

others/scripts/s2opcua/requirements.sh

@@ -63,7 +63,8 @@ tar xf check-0.15.2.tar.gz
 # S2OPC:
 rm -rf S2OPC
 echo "Fetching S2OPC OPC UA Toolkit libraries..."
-git clone https://gitlab.com/systerel/S2OPC.git
+git clone --depth 1 -b S2OPC_Toolkit_1.2.0 https://gitlab.com/systerel/S2OPC.git
+
 (
 	cd S2OPC
 	cp ../scripts/s2opcua/S2OPC.patch .

packages/Debian/common/DEBIAN/postinst

@@ -113,8 +113,8 @@ copy_new_data () {
 }
 
 install_pip3_packages () {
-    pip3 install --upgrade pip
-    pip3 install -r /usr/local/fledge/python/requirements.txt
+    python3 -m pip install --upgrade pip
+    python3 -m pip install -r /usr/local/fledge/python/requirements.txt
 }
 
 # Call Fledge package update script

plugins/make_deb

@@ -246,6 +246,10 @@ EOF
         fi
         mkdir -p build; cd build; cmake ..; make)
         mkdir -p "plugins/${plugin_type_install}/${plugin_install_dirname}"
+        if [ -f "${GIT_ROOT}/extras_install.sh" ]; then
+            sed -i "s/sudo//" ${GIT_ROOT}/extras_install.sh
+            cp -p ${GIT_ROOT}/extras_install.sh plugins/${plugin_type_install}/${plugin_install_dirname}/extras_install.sh
+        fi
         cp -R --preserve=links ${GIT_ROOT}/build/lib* "plugins/${plugin_type_install}/${plugin_install_dirname}" 2>/dev/null || \
         cp -R --preserve=links ${GIT_ROOT}/*.json "plugins/${plugin_type_install}/${plugin_install_dirname}" 2>/dev/null || \
         echo "Unable to find libraries in ${GIT_ROOT}/build and json config files in ${GIT_ROOT}, cannot proceed..."

plugins/packages/DEBIAN/postinst

@@ -34,15 +34,23 @@ set_files_ownership () {
 set_files_ownership
 
 # Install Prerequisite; if any
+
+# For Python based plugins
 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 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
+
+# For C based plugins
+if [ -f /usr/local/fledge/__INSTALL_DIR__/extras_install.sh ]; then
+    ./usr/local/fledge/__INSTALL_DIR__/extras_install.sh
+fi
+
 echo __PLUGIN_NAME__ __PLUGIN_TYPE__ plugin is installed.
+
 echo "
 __PLUGIN_NOTES__
 "