From 98b57f380d4bedbbe9a0eea174075f8c62aea6bd Mon Sep 17 00:00:00 2001
From: Todd Leonhardt <todd.leonhardt@gmail.com>
Date: Wed, 21 Jun 2017 06:54:58 -0400
Subject: Moved example scripts from examples to examples/scripts directly

Cleaned up the examples directory by adding a scripts subdirectory.

This makes it a bit clearer which Python files are example cmd2 applications and which are example Python scripts for use with the pyscript command.
---
 examples/arg_printer.py         |  8 --------
 examples/python_scripting.py    |  2 +-
 examples/script.py              |  7 -------
 examples/script.txt             |  2 --
 examples/script_conditional.py  | 39 ---------------------------------------
 examples/scripts/arg_printer.py |  8 ++++++++
 examples/scripts/conditional.py | 39 +++++++++++++++++++++++++++++++++++++++
 examples/scripts/script.py      |  7 +++++++
 examples/scripts/script.txt     |  2 ++
 9 files changed, 57 insertions(+), 57 deletions(-)
 delete mode 100755 examples/arg_printer.py
 delete mode 100644 examples/script.py
 delete mode 100644 examples/script.txt
 delete mode 100644 examples/script_conditional.py
 create mode 100755 examples/scripts/arg_printer.py
 create mode 100644 examples/scripts/conditional.py
 create mode 100644 examples/scripts/script.py
 create mode 100644 examples/scripts/script.txt

diff --git a/examples/arg_printer.py b/examples/arg_printer.py
deleted file mode 100755
index 848dcf99..00000000
--- a/examples/arg_printer.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-# coding=utf-8
-import os
-import sys
-print("Running Python script {!r} which was called with {} arguments".format(os.path.basename(sys.argv[0]),
-                                                                             len(sys.argv) - 1))
-for i, arg in enumerate(sys.argv[1:]):
-    print("arg {}: {!r}".format(i+1, arg))
diff --git a/examples/python_scripting.py b/examples/python_scripting.py
index 716a18a3..a0d36e36 100755
--- a/examples/python_scripting.py
+++ b/examples/python_scripting.py
@@ -12,7 +12,7 @@ users will want to create a script with conditional control flow - where the nex
 from the previous command.  This is where the ability to run Python scripts inside a cmd2 application via the pyscript
 command and the "pyscript <script> [arguments]" syntax comes into play.
 
-This application and the "script_conditional.py" script serve as an example for one way in which this can be done.
+This application and the "scripts/conditional.py" script serve as an example for one way in which this can be done.
 """
 import functools
 import os
diff --git a/examples/script.py b/examples/script.py
deleted file mode 100644
index 3f60c8fb..00000000
--- a/examples/script.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-# coding=utf-8
-"""
-Trivial example of a Python script which can be run inside a cmd2 application.
-"""
-print("This is a python script running ...")
-
diff --git a/examples/script.txt b/examples/script.txt
deleted file mode 100644
index 1e18262a..00000000
--- a/examples/script.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-help
-help history
diff --git a/examples/script_conditional.py b/examples/script_conditional.py
deleted file mode 100644
index c26bd5fe..00000000
--- a/examples/script_conditional.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# coding=utf-8
-"""
-This is a Python script intended to be used with the "python_scripting.py" cmd2 example application.
-
-To run it you should do the following:
-    ./python_scripting.py
-    pyscript script_conditional.py directory_path
-
-Note: The "cmd" function is defined within the cmd2 embedded Python environment and in there "self" is your cmd2
-application instance.
-"""
-import os
-import sys
-
-
-if len(sys.argv) > 1:
-    directory = sys.argv[1]
-    print('Using specified directory: {!r}'.format(directory))
-else:
-    directory = 'foobar'
-    print('Using default directory: {!r}'.format(directory))
-
-# Keep track of where we stared
-original_dir = os.getcwd()
-
-# Try to change to the specified directory
-cmd('cd {}'.format(directory))
-
-# Conditionally do something based on the results of the last command
-if self._last_result:
-    print('\nContents of directory {!r}:'.format(directory))
-    cmd('dir -l')
-
-    # Change back to where we were
-    print('Changing back to original directory: {!r}'.format(original_dir))
-    cmd('cd {}'.format(original_dir))
-else:
-    # cd command failed, print a warning
-    print('Failed to change directory to {!r}'.format(directory))
diff --git a/examples/scripts/arg_printer.py b/examples/scripts/arg_printer.py
new file mode 100755
index 00000000..848dcf99
--- /dev/null
+++ b/examples/scripts/arg_printer.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+# coding=utf-8
+import os
+import sys
+print("Running Python script {!r} which was called with {} arguments".format(os.path.basename(sys.argv[0]),
+                                                                             len(sys.argv) - 1))
+for i, arg in enumerate(sys.argv[1:]):
+    print("arg {}: {!r}".format(i+1, arg))
diff --git a/examples/scripts/conditional.py b/examples/scripts/conditional.py
new file mode 100644
index 00000000..1eeeadba
--- /dev/null
+++ b/examples/scripts/conditional.py
@@ -0,0 +1,39 @@
+# coding=utf-8
+"""
+This is a Python script intended to be used with the "python_scripting.py" cmd2 example application.
+
+To run it you should do the following:
+    ./python_scripting.py
+    pyscript scripts/conditional.py directory_path
+
+Note: The "cmd" function is defined within the cmd2 embedded Python environment and in there "self" is your cmd2
+application instance.
+"""
+import os
+import sys
+
+
+if len(sys.argv) > 1:
+    directory = sys.argv[1]
+    print('Using specified directory: {!r}'.format(directory))
+else:
+    directory = 'foobar'
+    print('Using default directory: {!r}'.format(directory))
+
+# Keep track of where we stared
+original_dir = os.getcwd()
+
+# Try to change to the specified directory
+cmd('cd {}'.format(directory))
+
+# Conditionally do something based on the results of the last command
+if self._last_result:
+    print('\nContents of directory {!r}:'.format(directory))
+    cmd('dir -l')
+
+    # Change back to where we were
+    print('Changing back to original directory: {!r}'.format(original_dir))
+    cmd('cd {}'.format(original_dir))
+else:
+    # cd command failed, print a warning
+    print('Failed to change directory to {!r}'.format(directory))
diff --git a/examples/scripts/script.py b/examples/scripts/script.py
new file mode 100644
index 00000000..3f60c8fb
--- /dev/null
+++ b/examples/scripts/script.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+# coding=utf-8
+"""
+Trivial example of a Python script which can be run inside a cmd2 application.
+"""
+print("This is a python script running ...")
+
diff --git a/examples/scripts/script.txt b/examples/scripts/script.txt
new file mode 100644
index 00000000..1e18262a
--- /dev/null
+++ b/examples/scripts/script.txt
@@ -0,0 +1,2 @@
+help
+help history
-- 
cgit v1.2.1