appimage: Get the appimage build working.

- zesty -> cosmic
- appimage 9 -> appimage 12
- vigil -> eris

TODO

@@ -1,7 +1,6 @@
 Todo
 - Publish on pypi.
 - Make a snap build work.
-- Check the appimage build.
 
 
 Todo (tool related)
@@ -169,6 +168,8 @@ Done
 - Add "git log <path>".
 - Change to using python3.7.
 - Rename project to Eris.
+- Make a flatpak build work.
+- Check the appimage build.
 
 A-syntax, B-tests, C-auto docs, D-lint, E-coverage, F-profile, G-tidy, H-import deps
              A B C D E F G H
@@ -273,7 +274,6 @@ Ideas
   editor? pygment syntax theme? Compress the cache? Ignore which paths? Log to disk?
   The cache path?
 - Have a command-line option to create workers that run remotely.
-- Make a flatpak build work.
 
 
 Shelved

install-dependencies

@@ -13,7 +13,7 @@ if [ $DIST_ID != "ubuntu" ]; then
     exit 1
 fi
 echo "Installing the dependencies of the eris script…"
-sudo apt --yes install python3.7 util-linux
+sudo apt --yes install python3-pip python3.7 util-linux
 python3.7 -m pip install pyinotify pygments docopt pillow toml
 echo
 echo "Installing all the tools eris may need…"

install-tools

@@ -27,10 +27,10 @@ if pip_deps:
 if go_deps:
     subprocess.run(["sudo", "apt-get", "-y", "install", "golang-go"],
                    check=True)
-    subprocess.run(["go", "get", "-u"] + list(go_deps), check=True)
+    subprocess.run(["go", "get"] + list(go_deps), check=True)
 
 if luarocks_deps:
-    subprocess.run(["sudo", "apt-get", "-y", "install", "luarocks"],
-                   check=True)
+    subprocess.run(["sudo", "apt-get", "-y", "install", "luarocks",
+                    "liblua5.3-dev"], check=True)
     subprocess.run(["sudo", "luarocks", "install"] + list(luarocks_deps),
                    check=True)

make-appimage.py

@@ -57,44 +57,22 @@ def make_ubuntu_base():
 def install_eris():
     run_in_container = test_distributions.run_in_container
     run_in_container("ubuntu", "./install-dependencies")
-    # libunionpreload doesn't trick shebangs?
-    run_in_container("ubuntu", "sed -i -e "
-                     "'s/\/usr\/bin\/python/\/usr\/bin\/env python/g' "
-                     "/usr/bin/pdf2txt")
-    run_in_container("ubuntu", "apt-get install --yes python3-pip")
     run_in_container("ubuntu", "pip3 install -I .")
 
 
-# FIX: This isn`t making the correct libunionpreload.
-# def make_libunionpreload():
-#  #See https://github.com/AppImage/AppImages/blob/master/recipes/meta/Recipe
-#     temp_dir = tempfile.mkdtemp()
-#     cmd("wget -q https://raw.githubusercontent.com/mikix/deb2snap/"
-#         "blob/847668c4a89e2d4a1711fe062a4bae0c7ab81bd0/src/preload.c "
-#         "-O - | sed -e 's|SNAPPY|UNION|g' | sed -e 's|SNAPP|UNION|g' | "
-#         "sed -e 's|SNAP|UNION|g' | sed -e 's|snappy|union|g' "
-#         "> %s/libunionpreload.c" % temp_dir)
-#     cmd("gcc -shared -fPIC %s/libunionpreload.c -o libunionpreload.so "
-#         '-ldl -DUNION_LIBNAME="libunionpreload.so"' % temp_dir)
-#     cmd("strip libunionpreload.so")
-
-
 def make_app_dir(app_dir, new_paths):
     os.mkdir(app_dir)
     make_sub_container("ubuntu", app_dir, new_paths)
     cmd(f"cp -a {ERIS_PATH}/tests {app_dir}")
     cmd(f"cp -a {ERIS_PATH}/test-all {app_dir}")
     cmd(f"cp {ERIS_PATH}/appimage/* {app_dir}")
-    # if not os.path.exists("libunionpreload.so"):
-    #     make_libunionpreload()
-    # cmd("cp libunionpreload.so " + app_dir)
 
 
 def make_appimage(app_dir):
     cmd("wget --continue https://github.com/AppImage/AppImageKit/releases/"
-        "download/9/appimagetool-x86_64.AppImage")
+        "download/12/appimagetool-x86_64.AppImage")
     cmd("chmod +x appimagetool-x86_64.AppImage")
-    cmd("./appimagetool-x86_64.AppImage " + app_dir)
+    cmd("ARCH=x86_64 ./appimagetool-x86_64.AppImage --comp xz " + app_dir)
 
 
 def main(work_path):

test_distributions.py

@@ -37,7 +37,7 @@ def run_in_container(container, command):
 
 
 def build_ubuntu():
-    cmd("sudo debootstrap zesty ubuntu.part")
+    cmd("sudo debootstrap cosmic ubuntu.part")
     run_in_container("ubuntu.part",
                      "ln -sf /lib/systemd/resolv.conf /etc/resolv.conf")
     run_in_container("ubuntu.part",