relocate splunklib under lib folder

Eric Cheng · Eric Cheng · commit 9bbc3c9ed32c · 2019-01-10T14:34:36.000+08:00
diff --git a/examples/searchcommands_app/README.md b/examples/searchcommands_app/README.md
@@ -15,14 +15,14 @@ The app is tested on Splunk 5 and 6. Here is its manifest:
 
 ```
 ├── bin
-│   ├── splunklib
-│   │   └── searchcommands ....... splunklib.searchcommands module
 │   ├── countmatches.py .......... CountMatchesCommand implementation
 │   ├── generatetext.py .......... GenerateTextCommand implementation
 │   ├── pypygeneratetext.py ...... Executes generatetext.py with PyPy
 │   ├── simulate.py .............. SimulateCommand implementation
-│   ├── sum.py ................... SumCommand implementation
-│   └── 
+│   └── sum.py ................... SumCommand implementation
+├── lib
+│   └── splunklib
+│       └── searchcommands ....... splunklib.searchcommands module
 ├── default
 │   ├── data
 │   │   └── ui
diff --git a/examples/searchcommands_app/package/bin/countmatches.py b/examples/searchcommands_app/package/bin/countmatches.py
@@ -19,9 +19,10 @@
 import app
 import sys
 
+from splunk.clilib.bundle_paths import make_splunkhome_path
 sys.path.append(make_splunkhome_path(['etc', 'apps', 'searchcommands_app', 'lib']))
-from packages.splunklib.searchcommands import dispatch, StreamingCommand, Configuration, Option, validators
-from packages.splunklib import six
+from splunklib.searchcommands import dispatch, StreamingCommand, Configuration, Option, validators
+from splunklib import six
 
 
 @Configuration()
diff --git a/examples/searchcommands_app/package/bin/filter.py b/examples/searchcommands_app/package/bin/filter.py
@@ -17,12 +17,12 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 import app
-
 import sys
 
+from splunk.clilib.bundle_paths import make_splunkhome_path
 sys.path.append(make_splunkhome_path(['etc', 'apps', 'searchcommands_app', 'lib']))
-from packages.splunklib.searchcommands import dispatch, EventingCommand, Configuration, Option
-from packages.splunklib.searchcommands.validators import Code
+from splunklib.searchcommands import dispatch, EventingCommand, Configuration, Option
+from splunklib.searchcommands.validators import Code
 
 
 
diff --git a/examples/searchcommands_app/package/bin/generatehello.py b/examples/searchcommands_app/package/bin/generatehello.py
@@ -20,9 +20,10 @@
 import sys
 import time
 
+from splunk.clilib.bundle_paths import make_splunkhome_path
 sys.path.append(make_splunkhome_path(['etc', 'apps', 'searchcommands_app', 'lib']))
-from packages.splunklib.searchcommands import dispatch, GeneratingCommand, Configuration, Option, validators
-from six.moves import range
+from splunklib.searchcommands import dispatch, GeneratingCommand, Configuration, Option, validators
+from splunklib.six.moves import range
 
 
 @Configuration()
diff --git a/examples/searchcommands_app/package/bin/generatetext.py b/examples/searchcommands_app/package/bin/generatetext.py
@@ -20,10 +20,11 @@
 import sys
 import time
 
+from splunk.clilib.bundle_paths import make_splunkhome_path
 sys.path.append(make_splunkhome_path(['etc', 'apps', 'searchcommands_app', 'lib']))
-from packages.splunklib.searchcommands import dispatch, GeneratingCommand, Configuration, Option, validators
-from packages.splunklib import six
-from packages.splunklib.six.moves import range
+from splunklib.searchcommands import dispatch, GeneratingCommand, Configuration, Option, validators
+from splunklib import six
+from splunklib.six.moves import range
 
 
 @Configuration()
diff --git a/examples/searchcommands_app/package/bin/pypygeneratetext.py b/examples/searchcommands_app/package/bin/pypygeneratetext.py
@@ -65,8 +65,9 @@
 import app
 import sys
 
+from splunk.clilib.bundle_paths import make_splunkhome_path
 sys.path.append(make_splunkhome_path(['etc', 'apps', 'searchcommands_app', 'lib']))
-from packages.splunklib.searchcommands import app_root, execute
+from splunklib.searchcommands import app_root, execute
 from os import environ, path
 
 
diff --git a/examples/searchcommands_app/package/bin/simulate.py b/examples/searchcommands_app/package/bin/simulate.py
@@ -23,8 +23,9 @@
 import sys
 import time
 
+from splunk.clilib.bundle_paths import make_splunkhome_path
 sys.path.append(make_splunkhome_path(['etc', 'apps', 'searchcommands_app', 'lib']))
-from packages.splunklib.searchcommands import dispatch, GeneratingCommand, Configuration, Option, validators
+from splunklib.searchcommands import dispatch, GeneratingCommand, Configuration, Option, validators
 
 
 @Configuration()
diff --git a/examples/searchcommands_app/package/bin/sum.py b/examples/searchcommands_app/package/bin/sum.py
@@ -19,8 +19,9 @@
 import app
 import sys
 
+from splunk.clilib.bundle_paths import make_splunkhome_path
 sys.path.append(make_splunkhome_path(['etc', 'apps', 'searchcommands_app', 'lib']))
-from packages.splunklib.searchcommands import dispatch, ReportingCommand, Configuration, Option, validators
+from splunklib.searchcommands import dispatch, ReportingCommand, Configuration, Option, validators
 
 
 @Configuration(requires_preop=True)
diff --git a/examples/searchcommands_app/package/lib/splunklib b/examples/searchcommands_app/package/lib/splunklib
diff --git a/examples/searchcommands_app/setup.py b/examples/searchcommands_app/setup.py
@@ -454,13 +454,12 @@ def run(self):
             'Topic :: System :: Logging',
             'Topic :: System :: Monitoring'],
         packages=[
-            'lib.packages.splunklib', 'lib.packages.splunklib.searchcommands'
+            'lib.splunklib', 'lib.splunklib.searchcommands'
         ],
         package_dir={
             'lib': os.path.join('package', 'lib'),
-            'lib.packages': os.path.join('package', 'lib', 'packages'),
-            'lib.packages.splunklib': os.path.join('..', '..', 'splunklib'),
-            'lib.packages.splunklib.searchcommands': os.path.join('..', '..', 'splunklib', 'searchcommands')
+            'lib.splunklib': os.path.join('..', '..', 'splunklib'),
+            'lib.splunklib.searchcommands': os.path.join('..', '..', 'splunklib', 'searchcommands')
         },
         package_data={
             'bin': [
