Preparata release 1.4.0

src/loaih/build.py

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

src/loaih/version.py

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