Fix missing imports and typos/C&P bugs

Flamefire · Flamefire · commit 47d49d8be10b · 2019-05-27T17:34:09.000+02:00
diff --git a/spython/image/__init__.py b/spython/image/__init__.py
@@ -8,7 +8,7 @@
 import hashlib
 import os
 import re
-
+from spython.logger import bot
 
 class ImageBase(object):
 
diff --git a/spython/image/cmd/create.py b/spython/image/cmd/create.py
@@ -6,6 +6,7 @@
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
+import os
 from spython.logger import bot
 
 def create(self,image_path, size=1024, sudo=False):
diff --git a/spython/image/cmd/utils.py b/spython/image/cmd/utils.py
@@ -6,6 +6,7 @@
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
+import os
 from spython.logger import bot
 
 def compress(self, image_path):
diff --git a/spython/instance/cmd/iutils.py b/spython/instance/cmd/iutils.py
@@ -5,6 +5,8 @@
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from spython.instance import Instance
+from spython.logger import bot
 
 def parse_table(table_string, header, remove_rows=1):
     '''parse a table to json from a string, where a header is expected by default.
@@ -49,7 +51,7 @@ def get(self, name, return_json=False, quiet=False):
     cmd = self._init_command(subgroup)
 
     cmd.append(name)
-    output = run_command(cmd, quiet=True)
+    output = self.run_command(cmd, quiet=True)
 
     # Success, we have instances
 
diff --git a/spython/logger/progress.py b/spython/logger/progress.py
@@ -104,7 +104,7 @@ def bar(it, label='', width=32, hide=None, empty_char=BAR_EMPTY_CHAR,
 
     count = len(it) if expected_size is None else expected_size
 
-    with Bar(label=label, width=width, hide=hide, empty_char=BAR_EMPTY_CHAR,
+    with ProgressBar(label=label, width=width, hide=hide, empty_char=BAR_EMPTY_CHAR,
              filled_char=BAR_FILLED_CHAR, expected_size=count, every=every) \
             as bar:
         for i, item in enumerate(it):
diff --git a/spython/main/parse/converters.py b/spython/main/parse/converters.py
@@ -7,6 +7,7 @@
 
 
 import re
+from spython.logger import bot
 
 from spython.logger import bot
 
diff --git a/spython/main/parse/recipe.py b/spython/main/parse/recipe.py
@@ -282,7 +282,7 @@ def _clean_line(self, line):
         return line.split('#')[0].strip()
 
 
-    def _write_script(path, lines, chmod=True):
+    def _write_script(self, path, lines, chmod=True):
         '''write a script with some lines content to path in the image. This
            is done by way of adding echo statements to the install section.
 
@@ -296,7 +296,7 @@ def _write_script(path, lines, chmod=True):
         if len(lines) > 0:
             lastline = lines.pop()
         for line in lines:
-            self.install.append('echo "%s" >> %s' %path)
+            self.install.append('echo "%s" >> %s' %line %path)
         self.install.append(lastline)     
 
         if chmod is True:
diff --git a/spython/oci/cmd/mounts.py b/spython/oci/cmd/mounts.py
@@ -16,8 +16,8 @@ def mount(self, image, sudo=None):
     return self._state_command(image, command="mount", sudo=sudo)
 
 
-def umount(self, image):
-    '''delete an OCI bundle createdfrom SIF image
+def umount(self, image, sudo=None):
+    '''delete an OCI bundle created from SIF image
 
        Parameters
        ==========

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`
`9`	`9`	`import re`
	`10`	`+from spython.logger import bot`
`10`	`11`
`11`	`12`	`from spython.logger import bot`
`12`	`13`