Correzione file ver. Spero sistemato problema di lingua.

This commit is contained in:
Emiliano Vavassori 2022-03-30 00:42:31 +02:00
parent cc31d82eb2
commit f2c64e195f
1 changed files with 13 additions and 7 deletions

View File

@ -215,14 +215,20 @@ class Build(object):
buildtarballs.extend([ x for x in self.tarballs[arch] if ('pack' + lang) in x ]) buildtarballs.extend([ x for x in self.tarballs[arch] if ('pack' + lang) in x ])
else: else:
buildtarballs.extend([ x for x in self.tarballs[arch] if ('langpack' + lang) in x ]) buildtarballs.extend([ x for x in self.tarballs[arch] if ('langpack' + lang) in x ])
else: elif self.language == 'full':
# In any other cases, we build with all languages if self.offline_help:
if not self.offline_help:
buildtarballs.extend([ x for x in self.tarballs[arch] if 'langpack' in x ])
else:
# We need also all help. Let's replace buildtarball with the # We need also all help. Let's replace buildtarball with the
# whole bunch # whole bunch
buildtarballs = self.tarballs[arch] buildtarballs = self.tarballs[arch]
else:
buildtarballs.extend([ x for x in self.tarballs[arch] if 'langpack' in x ])
else:
# Looping for each language in self.language
for lang in self.language.split(","):
if self.offline_help:
buildtarballs.extend([ x for x in self.tarballs[arch] if ('pack' + lang) in x ])
else:
buildtarballs.extend([ x for x in self.tarballs[arch] if ('langpack' + lang) in x ])
# Unpacking the tarballs # Unpacking the tarballs
for archive in buildtarballs: for archive in buildtarballs:
@ -268,7 +274,7 @@ class Build(object):
if generalize: if generalize:
subprocess.run("VERSION={version} ./appimagetool -u 'zsync|{zsync}' -v ./{appname}.AppDir/".format(version = self.genappversion, zsync = self.genappimagefilename[arch] + '.zsync', appname = self.appname), shell=True) subprocess.run("VERSION={version} ./appimagetool -u 'zsync|{zsync}' -v ./{appname}.AppDir/".format(version = self.genappversion, zsync = self.genappimagefilename[arch] + '.zsync', appname = self.appname), shell=True)
# Build version file management # Build version file management
with open(self.appimagefilename[arch] + '.ver', 'w') as v: with open(self.genappimagefilename[arch] + '.ver', 'w') as v:
v.write(self.version) v.write(self.version)
else: else:
subprocess.run("VERSION={version} ./appimagetool -u 'zsync|{zsync}' -v ./{appname}.AppDir/".format(version = self.appversion, zsync = self.appimagefilename[arch] + '.zsync', appname = self.appname), shell=True) subprocess.run("VERSION={version} ./appimagetool -u 'zsync|{zsync}' -v ./{appname}.AppDir/".format(version = self.appversion, zsync = self.appimagefilename[arch] + '.zsync', appname = self.appname), shell=True)
@ -276,7 +282,7 @@ class Build(object):
else: else:
if generalize: if generalize:
subprocess.run("VERSION={version} ./appimagetool -v ./{appname}.AppDir/".format(version = self.genappversion, appname = self.appname), shell=True) subprocess.run("VERSION={version} ./appimagetool -v ./{appname}.AppDir/".format(version = self.genappversion, appname = self.appname), shell=True)
with open(self.appimagefilename[arch] + '.ver', 'w') as v: with open(self.genappimagefilename[arch] + '.ver', 'w') as v:
v.write(self.version) v.write(self.version)
else: else:
subprocess.run("VERSION={version} ./appimagetool -v ./{appname}.AppDir/".format(version = self.appversion, appname = self.appname), shell=True) subprocess.run("VERSION={version} ./appimagetool -v ./{appname}.AppDir/".format(version = self.appversion, appname = self.appname), shell=True)