diff --git a/loaih/__init__.py b/loaih/__init__.py index ecd087c..d682d94 100644 --- a/loaih/__init__.py +++ b/loaih/__init__.py @@ -47,11 +47,6 @@ class Build(object): def check(self, storage_path): """Checking if the requested AppImage has been already built.""" self.storage_path = storage_path + ('/portable' if self.portable else '') - # Incompatibilities - if portable and updatable are asked together, - # only portable will be built. - if self.portable and self.updatable: - print("Upgradable and portable options were required together. Building only portable.") - self.updatable = False for arch in self.arch: res = subprocess.check_output("find {path} -name '{appimage}'".format( @@ -114,6 +109,12 @@ class Build(object): if self.portable and not 'portable' in self.storage_path: self.storage_path += "/portable" + # Incompatibilities - if portable and updatable are asked together, + # only portable will be built. + if self.portable and self.updatable: + print("Upgradable and portable options were required together. Building only portable.") + self.updatable = False + for arch in self.arch: # Checking if a valid path has been provided if self.url[arch] == '-': @@ -167,7 +168,7 @@ class Build(object): # At this point, let's decompress the deb packages subprocess.run("find .. -iname '*.deb' -exec dpkg -x {} . \;", shell=True, cwd=self.appimagedir) if self.portable: - shortversion = str.join('.', self.version.split('.')[:3]) + shortversion = self.version.split('.')[0-2].join('.') subprocess.run("find . -type f -iname 'bootstraprc' -exec sed -i 's|^UserInstallation=.*|UserInstallation=\$SYSUSERCONFIG/libreoffice/{version}|g' {} \+".format(version = shortversion), shell=True, cwd=self.appimagedir) # Changing desktop file