Merge pull request #9 from YunoHost-Apps/testing

Fix `java` path

README.md

@@ -17,8 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 ## Overview
 
 Design and prototyping platform meant for cross-domain teams. Non dependent on operating systems, web based and works with open standards (SVG). Penpot invites designers all over the world to fall in love with open source while getting developers excited about the design process in return.
-
-**Shipped version:** 1.19.3~ynh2
+**Shipped version:** 1.19.3~ynh3
 
 ## Screenshots
 
@@ -26,12 +25,12 @@ Design and prototyping platform meant for cross-domain teams. Non dependent on o
 
 ## Documentation and resources
 
-* Official app website: <https://penpot.app/>
-* Official user documentation: <https://help.penpot.app/user-guide/>
-* Official admin documentation: <https://help.penpot.app/technical-guide/>
-* Upstream app code repository: <https://github.com/penpot/penpot>
-* YunoHost Store: <https://apps.yunohost.org/app/penpot>
-* Report a bug: <https://github.com/YunoHost-Apps/penpot_ynh/issues>
+- Official app website: <https://penpot.app/>
+- Official user documentation: <https://help.penpot.app/user-guide/>
+- Official admin documentation: <https://help.penpot.app/technical-guide/>
+- Upstream app code repository: <https://github.com/penpot/penpot>
+- YunoHost Store: <https://apps.yunohost.org/app/penpot>
+- Report a bug: <https://github.com/YunoHost-Apps/penpot_ynh/issues>
 
 ## Developer info
 
@@ -39,10 +38,10 @@ Please send your pull request to the [testing branch](https://github.com/YunoHos
 
 To try the testing branch, please proceed like that.
 
-``` bash
+```bash
 sudo yunohost app install https://github.com/YunoHost-Apps/penpot_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade penpot -u https://github.com/YunoHost-Apps/penpot_ynh/tree/testing --debug
 ```
 
-**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
+**More info regarding app packaging:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -17,8 +17,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 ## Vue d’ensemble
 
 Design and prototyping platform meant for cross-domain teams. Non dependent on operating systems, web based and works with open standards (SVG). Penpot invites designers all over the world to fall in love with open source while getting developers excited about the design process in return.
-
-**Version incluse :** 1.19.3~ynh2
+**Version incluse :** 1.19.3~ynh3
 
 ## Captures d’écran
 
@@ -26,12 +25,12 @@ Design and prototyping platform meant for cross-domain teams. Non dependent on o
 
 ## Documentations et ressources
 
-* Site officiel de l’app : <https://penpot.app/>
-* Documentation officielle utilisateur : <https://help.penpot.app/user-guide/>
-* Documentation officielle de l’admin : <https://help.penpot.app/technical-guide/>
-* Dépôt de code officiel de l’app : <https://github.com/penpot/penpot>
-* YunoHost Store: <https://apps.yunohost.org/app/penpot>
-* Signaler un bug : <https://github.com/YunoHost-Apps/penpot_ynh/issues>
+- Site officiel de l’app : <https://penpot.app/>
+- Documentation officielle utilisateur : <https://help.penpot.app/user-guide/>
+- Documentation officielle de l’admin : <https://help.penpot.app/technical-guide/>
+- Dépôt de code officiel de l’app : <https://github.com/penpot/penpot>
+- YunoHost Store : <https://apps.yunohost.org/app/penpot>
+- Signaler un bug : <https://github.com/YunoHost-Apps/penpot_ynh/issues>
 
 ## Informations pour les développeurs
 
@@ -39,10 +38,10 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno
 
 Pour essayer la branche testing, procédez comme suit.
 
-``` bash
+```bash
 sudo yunohost app install https://github.com/YunoHost-Apps/penpot_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade penpot -u https://github.com/YunoHost-Apps/penpot_ynh/tree/testing --debug
 ```
 
-**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>
+**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>

manifest.toml

@@ -6,7 +6,7 @@ name = "Penpot"
 description.en = "Design and prototyping platform"
 description.fr = "Plateforme de conception et de prototypage"
 
-version = "1.19.3~ynh2"
+version = "1.19.3~ynh3"
 
 maintainers = ["orhtej2"]
 
@@ -44,7 +44,7 @@ ram.runtime = "50M"
         [resources.sources.main]
         url = "https://github.com/penpot/penpot/archive/refs/tags/1.19.3.tar.gz"
         sha256 = "2649db3bd8742540f76f33547095b227e86c5bda74908a900011b8516d4bb3ce"
-        
+
         [resources.sources.jdk]
         amd64.url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jdk_x64_linux_hotspot_21.0.2_13.tar.gz"
         amd64.sha256 = "454bebb2c9fe48d981341461ffb6bf1017c7b7c6e15c6b0c29b959194ba3aaa5"
@@ -72,7 +72,7 @@ ram.runtime = "50M"
 
     [resources.ports]
         [resources.ports.exporter]
-    
+
     [resources.apt]
     packages = [
         "postgresql",

scripts/install

@@ -44,7 +44,7 @@ ynh_secure_remove --file=$tmp_dir
 
 ynh_setup_source --dest_dir="$install_dir/babashka" --source_id="babashka"
 
-export PATH=$install_dir/clojure/bin:$install_dir/babashka:$PATH
+export PATH=$JAVA_HOME/bin:$install_dir/clojure/bin:$install_dir/babashka:$PATH
 
 #=================================================
 # APP "BUILD" (DEPLOYING SOURCES, VENV, COMPILING ETC)

scripts/upgrade

@@ -52,7 +52,7 @@ then
 
 	ynh_setup_source --dest_dir="$install_dir/babashka" --source_id="babashka"
 
-	export PATH=$install_dir/clojure/bin:$install_dir/babashka:$PATH
+	export PATH=$JAVA_HOME/bin:$install_dir/clojure/bin:$install_dir/babashka:$PATH
 
 	ynh_script_progression --message="Upgrading source files..."