Merge pull request #8 from foglamp/1.6.0RC

1.6.0RC to master
foglamp · May 24, 2019 · 7bc4fde · 7bc4fde
2 parents 833544c + 03de010
commit 7bc4fde
Show file tree

Hide file tree

Showing 10 changed files with 248 additions and 130 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,11 @@
+# IDE
+*.idea
+
+# Build
+packages/build/
+
+# Compiled Object files
+*.pyc
+
+# Test
+.pytest_cache
diff --git a/Description b/Description
@@ -0,0 +1 @@
+FogLAMP South Roxtec plugin for Transit service
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2018 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.

diff --git a/Package b/Package
@@ -0,0 +1,26 @@
+# A set of variables that define how we package this repository
+#
+plugin_name=roxtec
+plugin_type=south
+plugin_install_dirname=${plugin_name}
+
+# Now build up the runtime requirements list. This has 3 components
+#   1. Generic packages we depend on in all architectures and package managers
+#   2. Architecture specific packages we depend on
+#   3. Package manager specific packages we depend on
+requirements="foglamp"
+
+case "$arch" in
+	x86_64)
+		;;
+	armhf)
+		;;
+	aarch64)
+		;;
+esac
+case "$package_manager" in
+	deb)
+		;;
+	rpm)
+		;;
+esac
diff --git a/VERSION.south.roxtec b/VERSION.south.roxtec
@@ -1,2 +1,2 @@
-foglamp_south_roxtec_version=1.0.0
-foglamp_version>=1.3
+foglamp_south_roxtec_version=1.6.0
+foglamp_version>=1.6
diff --git a/make_deb b/make_deb
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ##--------------------------------------------------------------------
-## Copyright (c) 2018 OSIsoft, LLC
+## Copyright (c) 2018 Dianomic Systems
 ##
 ## Licensed under the Apache License, Version 2.0 (the "License");
 ## you may not use this file except in compliance with the License.

diff --git a/packages/Debian/DEBIAN/postinst b/packages/Debian/DEBIAN/postinst
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ##--------------------------------------------------------------------
-## Copyright (c) 2018 OSIsoft, LLC
+## Copyright (c) 2018 Dianomic Systems
 ##
 ## Licensed under the Apache License, Version 2.0 (the "License");
 ## you may not use this file except in compliance with the License.
@@ -31,11 +31,5 @@ set_files_ownership () {
     chown -R root:root /usr/local/foglamp/python/foglamp/plugins/south/roxtec
 }
 
-add_service () {
-    output=$(curl -sX POST http://localhost:8081/foglamp/service -d '{"name": "Roxtec South", "type": "south", "plugin": "roxtec", "enabled": true}')
-    echo ${output}
-}
-
 set_files_ownership
-add_service
 echo "Roxtec South plugin is installed."
diff --git a/packages/Debian/DEBIAN/preinst b/packages/Debian/DEBIAN/preinst
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		FogLAMP South Roxtec plugin for Transit service