fix: regression on type_2 format

Author: azubieta

appimagebuilder/commands/create_appimage.py

@@ -50,7 +50,6 @@ def __call__(self, *args, **kwargs):
         raise RuntimeError(f"Unknown AppImage format {appimage_format}")
 
     def _create_type_2_appimage(self):
-
         update_information = self.recipe.AppImage["update-information"]() or "None"
 
         sign_key = self.recipe.AppImage["sign-key"] or "None"

appimagebuilder/modules/prime/type_2.py

@@ -30,12 +30,10 @@
 
 
 class Type2Creator:
-    def __init__(self, recipe):
-        self.app_dir = recipe.AppDir.path()
-        self.target_arch = recipe.AppImage.arch()
-        self.app_name = recipe.AppDir.app_info.name()
-        self.app_version = recipe.AppDir.app_info.version()
-        self.update_information = recipe.AppImage["update-information"]() or "None"
+    def __init__(self, appdir, target_arch, update_information, sign_key, output_filename):
+        self.app_dir = appdir
+        self.target_arch = target_arch
+        self.update_information = update_information
         self.guess_update_information = False
 
         if self.update_information == "None":
@@ -47,15 +45,11 @@ def __init__(self, recipe):
             self.update_information = None
             self.guess_update_information = True
 
-        self.sing_key = recipe.AppImage["sign-key"]() or "None"
+        self.sing_key = sign_key
         if self.sing_key == "None":
             self.sing_key = None
 
-        fallback_file_name = os.path.join(
-            os.getcwd(),
-            "%s-%s-%s.AppImage" % (self.app_name, self.app_version, self.target_arch),
-        )
-        self.target_file = recipe.AppImage.file_name() or fallback_file_name
+        self.target_file = output_filename
 
     def create(self):
         self._assert_target_architecture()
@@ -67,7 +61,7 @@ def create(self):
         self._generate_appimage(runtime_path)
 
     def _generate_appimage(self, runtime_path):
-        appimage_tool = AppImageToolCommand(self.app_dir, self.file_name)
+        appimage_tool = AppImageToolCommand(self.app_dir, self.target_file)
         appimage_tool.target_arch = self.target_arch
         appimage_tool.update_information = self.update_information
         appimage_tool.guess_update_information = self.guess_update_information

examples/kcalc/AppImageBuilder.yml

@@ -70,7 +70,4 @@ AppDir:
 
 
 AppImage:
-  update-information: None
-  sign-key: None
   arch: x86_64
-  format: 3