Modernize the salt-cloud script

salt/scripts.py

@@ -10,6 +10,7 @@ import sys
 # Import salt libs
 import salt
 import salt.cli
+import salt.cloud.cli
 
 
 def salt_master():
@@ -105,6 +106,19 @@ def salt_ssh():
         raise SystemExit('\nExiting gracefully on Ctrl-c')
 
 
+def salt_cloud():
+    '''
+    The main function for salt-cloud
+    '''
+    if '' in sys.path:
+        sys.path.remove('')
+    try:
+        cloud = salt.cloud.cli.SaltCloud()
+        cloud.run()
+    except KeyboardInterrupt:
+        raise SystemExit('\nExiting gracefully on Ctrl-c')
+
+
 def salt_main():
     '''
     Publish commands to the salt system from the command line on the

scripts/salt-cloud

@@ -1,16 +1,10 @@
 #!/usr/bin/env python
+'''
+Publish commands to the salt system from the command line on the master.
+'''
 
-import salt.cloud.cli
+from salt.scripts import salt_cloud
 
-def main():
-    '''
-    The main function for salt-cloud
-    '''
-    cloud = salt.cloud.cli.SaltCloud()
-    cloud.run()
 
 if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        raise SystemExit('\nExiting gracefully on Ctrl-c')
+    salt_cloud()