ahamilton/eris
1
0
Fork 0
Code Releases Activity

release: appimage: Make an appimage from 21.10.

Browse source 
- appimagetool 12 -> 13.
- Pare down gcc.
- Appimage needs pexpect.
This commit is contained in:
Andrew Hamilton 2021-10-18 18:51:24 +10:00
parent e6cf2cfcc9
commit 1085385f39
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
install-dependencies
View file

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

11
make-appimage.py
View file

@ -34,8 +34,9 @@ def make_sub_container(src_root, dest_root, paths):
os.link(os.path.join(src_root, path), dest_path) os.link(os.path.join(src_root, path), dest_path)
def filter_paths(paths, excluded): def filter_paths(paths, exclusions):
return [path for path in paths if excluded not in path] return [path for path in paths
if all(excluded not in path for excluded in exclusions)]
def make_ubuntu_base(): def make_ubuntu_base():
@ -45,7 +46,7 @@ def make_ubuntu_base():
else: else:
test_distributions.build_ubuntu() test_distributions.build_ubuntu()
base_paths = relative_paths("ubuntu", all_paths("ubuntu")) base_paths = relative_paths("ubuntu", all_paths("ubuntu"))
base_paths = filter_paths(base_paths, "python3") base_paths = filter_paths(base_paths, ["python3"])
with open("base_paths", "wb") as file_: with open("base_paths", "wb") as file_:
pickle.dump(base_paths, file_) pickle.dump(base_paths, file_)
return base_paths return base_paths
@ -73,7 +74,7 @@ def cleanup_app_dir(app_dir):
def make_appimage(app_dir): def make_appimage(app_dir):
cmd("wget --continue https://github.com/AppImage/AppImageKit/releases/" cmd("wget --continue https://github.com/AppImage/AppImageKit/releases/"
"download/12/appimagetool-x86_64.AppImage") "download/13/appimagetool-x86_64.AppImage")
cmd("chmod +x appimagetool-x86_64.AppImage") cmd("chmod +x appimagetool-x86_64.AppImage")
cmd("ARCH=x86_64 ./appimagetool-x86_64.AppImage --comp xz " + app_dir) cmd("ARCH=x86_64 ./appimagetool-x86_64.AppImage --comp xz " + app_dir)
@ -85,7 +86,7 @@ def main(work_path):
install_eris() install_eris()
post_install_paths = relative_paths("ubuntu", all_paths("ubuntu")) post_install_paths = relative_paths("ubuntu", all_paths("ubuntu"))
new_paths = set(post_install_paths) - set(base_paths) new_paths = set(post_install_paths) - set(base_paths)
new_paths = filter_paths(new_paths, "/var/cache/apt/archives") new_paths = filter_paths(new_paths, ["/var/cache/apt/archives", "cc1", "lto1"])
app_dir = "eris.AppDir" app_dir = "eris.AppDir"
if os.path.exists(app_dir): if os.path.exists(app_dir):
cmd("sudo rm -rf " + app_dir) cmd("sudo rm -rf " + app_dir)

2
test_distributions.py
View file

@ -35,7 +35,7 @@ def run_in_container(container, command):
def build_ubuntu(): def build_ubuntu():
cmd("sudo debootstrap --components=main,restricted,universe,multiverse " cmd("sudo debootstrap --components=main,restricted,universe,multiverse "
"focal ubuntu.part http://au.archive.ubuntu.com/ubuntu/") "impish ubuntu.part http://au.archive.ubuntu.com/ubuntu/")
run_in_container("ubuntu.part", run_in_container("ubuntu.part",
"ln -sf /lib/systemd/resolv.conf /etc/resolv.conf") "ln -sf /lib/systemd/resolv.conf /etc/resolv.conf")
os.rename("ubuntu.part", "ubuntu") os.rename("ubuntu.part", "ubuntu")