ahamilton/eris
1
0
Fork 0
Code Releases Activity

Coding style.

Browse source 
- More linting.
This commit is contained in:
Andrew Hamilton 2019-12-05 00:52:59 +10:00
parent 4a2f99d795
commit d645f62b10
1 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
make-flatpak-manifest.py
View file

@ -113,8 +113,8 @@ def python_modules(package):
package], text=True) package], text=True)
sources = [] sources = []
for line in output.splitlines(): for line in output.splitlines():
if (line.startswith(" Downloading") or if line.startswith(" Downloading") or \
line.startswith(" Using cached")): line.startswith(" Using cached"):
url = line.split()[-1] url = line.split()[-1]
archive_path = os.path.join(temp_dir, os.path.basename(url)) archive_path = os.path.join(temp_dir, os.path.basename(url))
sources.append((url, get_file_sha256(archive_path))) sources.append((url, get_file_sha256(archive_path)))
@ -132,7 +132,8 @@ def python_modules(package):
def go_repo_source(repo_path): def go_repo_source(repo_path):
current_commit = subprocess.check_output(["git", "rev-parse", "HEAD"], current_commit = subprocess.check_output(["git", "rev-parse", "HEAD"],
cwd=repo_path, text=True).strip() cwd=repo_path, text=True).strip()
remote_url = subprocess.check_output(["git", "remote", "get-url", "origin"], remote_url = subprocess.check_output(
["git", "remote", "get-url", "origin"],
cwd=repo_path, text=True).strip() cwd=repo_path, text=True).strip()
dest_path = repo_path[repo_path.rfind("src/"):] dest_path = repo_path[repo_path.rfind("src/"):]
return {"type": "git", "url": remote_url, "commit": current_commit, return {"type": "git", "url": remote_url, "commit": current_commit,
@ -208,7 +209,8 @@ patches = {
"ghc": {"buildsystem": "simple", "ghc": {"buildsystem": "simple",
"build-commands": [ "build-commands": [
"mkdir -p /app/lib", "mkdir -p /app/lib",
"ln -s /usr/lib/x86_64-linux-gnu/libtinfo.so.6 /app/lib/libtinfo.so.5", "ln -s /usr/lib/x86_64-linux-gnu/libtinfo.so.6 "
"/app/lib/libtinfo.so.5",
"./configure --prefix=/app", "./configure --prefix=/app",
"make install"], "make install"],
"sources": [{ "sources": [{
@ -288,8 +290,10 @@ patches = {
], ],
"sources": [{ "sources": [{
"type": "archive", "type": "archive",
"url": "https://rakudostar.com/files/star/rakudo-star-2019.03.tar.gz", "url": "https://rakudostar.com/files/star/"
"sha256": "640a69de3a2b4f6c49e75a01040e8770de3650ea1d5bb61057e3dfa3c79cc008"}]}, "rakudo-star-2019.03.tar.gz",
"sha256": "640a69de3a2b4f6c49e75a01040e8770"
"de3650ea1d5bb61057e3dfa3c79cc008"}]},
"p7zip": {"buildsystem": "simple", "p7zip": {"buildsystem": "simple",
"build-commands": [ "build-commands": [
@ -403,7 +407,7 @@ def eris_modules():
def nodejs_modules(): def nodejs_modules():
return [{"name": "nodejs", return [{"name": "nodejs",
"cleanup": ["/include", "/share", "/lib/node_modules",], "cleanup": ["/include", "/share", "/lib/node_modules"],
"sources": [ "sources": [
{"type": "archive", {"type": "archive",
"url": "https://nodejs.org/dist/v9.9.0/node-v9.9.0.tar.gz", "url": "https://nodejs.org/dist/v9.9.0/node-v9.9.0.tar.gz",