libreitalia
/
loaih
7
0
Fork 0
Code Issues 8 Pull Requests Packages Releases 5 Wiki Activity

Drop-in replacing appimagetool from AppImage/appimagetool instead of AppImage/AppImageKit.

This commit is contained in:
emiliano.vavassori 2025-07-14 21:47:25 +02:00
parent a3c7e6a94d
commit f1f0a1e0de
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/loaih/build.py
View File

@ -260,7 +260,7 @@ class Build():
# And then cd to the appname folder. # And then cd to the appname folder.
os.chdir(self.appnamedir) os.chdir(self.appnamedir)
# Download appimagetool from github # Download appimagetool from github
appimagetoolurl = r"https://github.com/AppImage/AppImageKit/releases/" appimagetoolurl = r"https://github.com/AppImage/appimagetool/releases/"
appimagetoolurl += f"download/continuous/appimagetool-{self.arch}.AppImage" appimagetoolurl += f"download/continuous/appimagetool-{self.arch}.AppImage"
self.__download__(appimagetoolurl, 'appimagetool') self.__download__(appimagetoolurl, 'appimagetool')
os.chmod('appimagetool', 0o755) os.chmod('appimagetool', 0o755)
@ -708,11 +708,12 @@ class Build():
shutil.rmtree(os.path.abspath(os.path.join(self.appimagedir, local)), ignore_errors=True) shutil.rmtree(os.path.abspath(os.path.join(self.appimagedir, local)), ignore_errors=True)
# Download AppRun from github # Download AppRun from github
apprunurl = r"https://github.com/AppImage/AppImageKit/releases/" # With the new appimagetool, this shouldn't be needed anymore.
apprunurl += f"download/continuous/AppRun-{self.arch}" #apprunurl = r"https://github.com/AppImage/AppImageKit/releases/"
dest = os.path.join(self.appimagedir, 'AppRun') #apprunurl += f"download/continuous/AppRun-{self.arch}"
self.__download__(apprunurl, dest) #dest = os.path.join(self.appimagedir, 'AppRun')
os.chmod(dest, 0o755) #self.__download__(apprunurl, dest)
#os.chmod(dest, 0o755)
# Dealing with extra options # Dealing with extra options
buildopts = [] buildopts = []
@ -726,19 +727,19 @@ class Build():
buildopts_str = str.join(' ', buildopts) buildopts_str = str.join(' ', buildopts)
# Build the number-specific build # Build the number-specific build
command = f"{self.appnamedir}/appimagetool {buildopts_str} -v {self.appimagedir}"
if self.verbose: if self.verbose:
print("---- Start building ----") print("---- Start building ----")
subprocess.run(shlex.split( print(f"DEBUG: {command}")
f"{self.appnamedir}/appimagetool {buildopts_str} -v " + subprocess.run(shlex.split(command),
f"{self.appimagedir}" env={ "VERSION": self.appversion },
), env={ "VERSION": self.appversion }, check=True) check=True)
print("---- End building ----") print("---- End building ----")
else: else:
subprocess.run(shlex.split( subprocess.run(shlex.split(command),
f"{self.appnamedir}/appimagetool {buildopts_str} -v " + env={ "VERSION": self.appversion },
f"{self.appimagedir}" stdout=subprocess.DEVNULL,
), env={ "VERSION": self.appversion }, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
stderr=subprocess.DEVNULL, check=True)
if self.verbose: if self.verbose:
print(f"Built AppImage version {self.appversion}") print(f"Built AppImage version {self.appversion}")

2
src/loaih/version.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# encoding: utf-8 # encoding: utf-8
version = "1.4.0rc1" version = "1.4.0rc2"