Can create an AppImage with make-appimage.

vigil/__main__.py

@@ -41,12 +41,17 @@ from vigil import tools
 from vigil import worker
 
 
+if "APPDIR" in os.environ:
+    test_usage_line = "  vigil --self_test\n"
+    test_option_line = ("  --self_test                      "
+                        "Test that vigil is working properly.\n")
+else:
+    test_usage_line, test_option_line = "", ""
 USAGE = """
 Usage:
   vigil [options] <directory>
   vigil -h | --help
-  vigil --self_test
-
+%s
 Example:
   # vigil my_project
 
@@ -58,8 +63,7 @@ Options:
                                    the *edit command. It may contain options.
   -t THEME, --theme=THEME          The pygment theme used for syntax
                                    highlighting. Defaults to "native".
-  --self_test                      Test that vigil is working properly.
-"""
+%s""" % (test_usage_line, test_option_line)
 
 
 KEYS_DOC = """Keys:
@@ -1016,9 +1020,10 @@ def check_arguments():
     if arguments["--help"]:
         print(cmdline_help)
         sys.exit(0)
-    if arguments["--self_test"]:
-        test_path = os.path.join(os.path.dirname(__file__), "test-all")
-        sys.exit(subprocess.call([test_path]))
+    if "APPDIR" in os.environ and arguments["--self_test"]:
+        test_dir = os.path.join(os.environ["APPDIR"], "tests")
+        sys.exit(subprocess.call([os.path.join(test_dir, "test-all")],
+                                 cwd=test_dir))
     worker_count = None
     try:
         if arguments["--workers"] is not None:

vigil/tools.py

@@ -400,7 +400,8 @@ def pycodestyle(path):
     return _run_command([_python_version(path), "-m", "pycodestyle", path])
 
 
-@deps(deps={"pyflakes"}, arch_deps={"python2-pyflakes", "python-pyflakes"},
+@deps(deps={"python-pyflakes", "python3-pyflakes"},
+      arch_deps={"python2-pyflakes", "python-pyflakes"},
       opensuse_deps={"python2-pyflakes", "python3-pyflakes"}, url="pyflakes",
       missing_in={"gentoo"})
 def pyflakes(path):
@@ -611,7 +612,7 @@ def html2text(path):
     return _run_command(["html2text", path], Status.normal)
 
 
-@deps(deps={"gcc"}, url="https://gcc.gnu.org/", executables={"gcc"})
+@deps(deps={"gcc", "g++-6"}, url="https://gcc.gnu.org/", executables={"gcc"})
 def cpp_syntax_gcc(path):
     return _run_command(["gcc", "-fsyntax-only", path])