Merge pull request #3 from splunk/develop

Merge develop with master
splunk · Aug 10, 2021 · 35f7cdc · 35f7cdc
2 parents 9b49e6f + 3560895
commit 35f7cdc
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ This repository is **ONLY** useful if you are testing one of Splunk's SDKs. **DO
 This SDK App Collection is used to test the following SDKs:
 
 * [splunk-sdk-python](https://github.com/splunk/splunk-sdk-python)
-* [splunk-sdk-javascript](https://github.com/splunk/splunk-sdk-python)
+* [splunk-sdk-javascript](https://github.com/splunk/splunk-sdk-javascript)
 * [splunk-sdk-java](https://github.com/splunk/splunk-sdk-java)
 * [splunk-sdk-ruby](https://github.com/splunk/splunk-sdk-ruby)
 * [splunk-sdk-csharp](https://github.com/splunk/splunk-sdk-charp)

diff --git a/package.sh b/package.sh
@@ -2,10 +2,25 @@
 
 SRCDIR=src
 BUILDDIR=build
+PACKAGEDIR=sdkappcollection
 
 if [ ! -e $BUILDDIR ]; then mkdir $BUILDDIR; fi
 rm -f build/*.tar
+
 cd $SRCDIR
 for appdir in `ls -1 .`; do
-    tar -cf ../$BUILDDIR/$appdir.tar $appdir
+    tar -cf ../$BUILDDIR/$appdir.tar $appdir        # create .tar for all apps
+done
+for appdir in `ls -1 .`; do
+    tar -czf ../$BUILDDIR/$appdir.tgz $appdir       # create .tgz for all apps
 done
+
+cd ..                                               # navigate to the root level of sdk-app-collection
+cd ..                                               # navigate to one level up from sdk-app-collection
+
+if [ -d $PACKAGEDIR ]; then rm -Rf $PACKAGEDIR; fi  # remove if sdkappcollection already exists
+mkdir $PACKAGEDIR                                   # create an sdkappcollection directory
+cp -a ./sdk-app-collection/* ./$PACKAGEDIR/         # copy the content from sdk-app-collection to sdkappcollection
+tar -czf $PACKAGEDIR.tgz $PACKAGEDIR                # create a sdkappcollection.tgz from sdkappcollection
+rm -Rf $PACKAGEDIR                                  # remove sdkappcollection
+
diff --git a/src/modular-inputs/README/inputs.conf.spec → src/modular_inputs/README/inputs.conf.spec b/src/modular-inputs/README/inputs.conf.spec → src/modular_inputs/README/inputs.conf.spec
diff --git a/src/modular-inputs/bin/README → src/modular_inputs/bin/README b/src/modular-inputs/bin/README → src/modular_inputs/bin/README
diff --git a/src/modular-inputs/bin/echo.bat → src/modular_inputs/bin/echo.bat b/src/modular-inputs/bin/echo.bat → src/modular_inputs/bin/echo.bat
diff --git a/src/modular-inputs/bin/echo.sh → src/modular_inputs/bin/echo.sh b/src/modular-inputs/bin/echo.sh → src/modular_inputs/bin/echo.sh
diff --git a/src/modular-inputs/bin/test1.py → src/modular_inputs/bin/test1.py b/src/modular-inputs/bin/test1.py → src/modular_inputs/bin/test1.py
@@ -68,7 +68,7 @@
 
 if __name__ == '__main__':
     if len(sys.argv) > 1 and sys.argv[1] == "--scheme":
-        print scheme
+        print (scheme)
         exit(0)
 
 

diff --git a/src/modular-inputs/bin/test2.py → src/modular_inputs/bin/test2.py b/src/modular-inputs/bin/test2.py → src/modular_inputs/bin/test2.py
diff --git a/src/modular-inputs/default/app.conf → src/modular_inputs/default/app.conf b/src/modular-inputs/default/app.conf → src/modular_inputs/default/app.conf
@@ -7,7 +7,7 @@ is_configured = 0
 
 [ui]
 is_visible = 1
-label = modular-inputs
+label = modular_inputs
 
 [launcher]
 author = Splunk SDK