update READMEs

README.md

@@ -18,7 +18,7 @@ It shall NOT be edited by hand.
 
 Scratch is a free programming language and online community where you can create your own interactive stories, games, and animations.
 
-**Shipped version:** 4.1.3~ynh1
+**Shipped version:** 4.1.3~jaf1
 
 **Demo:** <https://scratch.mit.edu/projects/editor/?tutorial=getStarted>
 

README_es.md

@@ -18,7 +18,7 @@ No se debe editar a mano.
 
 Scratch is a free programming language and online community where you can create your own interactive stories, games, and animations.
 
-**Versión actual:** 4.1.3~ynh1
+**Versión actual:** 4.1.3~jaf1
 
 **Demo:** <https://scratch.mit.edu/projects/editor/?tutorial=getStarted>
 

README_eu.md

@@ -18,7 +18,7 @@ EZ editatu eskuz.
 
 Scratch is a free programming language and online community where you can create your own interactive stories, games, and animations.
 
-**Paketatutako bertsioa:** 4.1.3~ynh1
+**Paketatutako bertsioa:** 4.1.3~jaf1
 
 **Demoa:** <https://scratch.mit.edu/projects/editor/?tutorial=getStarted>
 

README_fr.md

@@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main.
 
 Scratch est un langage de programmation graphique manipulable et exécutable par le logiciel de même nom à vocation éducative. Ainsi, Scratch est à la fois un environnement de développement et un moteur d’exécution du langage Scratch mais aussi un site web.
 
-**Version incluse :** 4.1.3~ynh1
+**Version incluse :** 4.1.3~jaf1
 
 **Démo :** <https://scratch.mit.edu/projects/editor/?tutorial=getStarted>
 

README_gl.md

@@ -18,7 +18,7 @@ NON debe editarse manualmente.
 
 Scratch is a free programming language and online community where you can create your own interactive stories, games, and animations.
 
-**Versión proporcionada:** 4.1.3~ynh1
+**Versión proporcionada:** 4.1.3~jaf1
 
 **Demo:** <https://scratch.mit.edu/projects/editor/?tutorial=getStarted>
 

README_id.md

@@ -18,7 +18,7 @@ Ini TIDAK boleh diedit dengan tangan.
 
 Scratch is a free programming language and online community where you can create your own interactive stories, games, and animations.
 
-**Versi terkirim:** 4.1.3~ynh1
+**Versi terkirim:** 4.1.3~jaf1
 
 **Demo:** <https://scratch.mit.edu/projects/editor/?tutorial=getStarted>
 

README_it.md

@@ -18,7 +18,7 @@ NON DEVE essere modificato manualmente.
 
 Scratch is a free programming language and online community where you can create your own interactive stories, games, and animations.
 
-**Versione pubblicata:** 3.0~ynh3
+**Versione pubblicata:** 3.0~jaf1
 
 **Prova:** <https://llk.github.io/scratch-gui/develop/>
 

README_nl.md

@@ -18,7 +18,7 @@ Hij mag NIET handmatig aangepast worden.
 
 Scratch is a free programming language and online community where you can create your own interactive stories, games, and animations.
 
-**Geleverde versie:** 4.1.3~ynh1
+**Geleverde versie:** 4.1.3~jaf1
 
 **Demo:** <https://scratch.mit.edu/projects/editor/?tutorial=getStarted>
 

README_ru.md

@@ -18,7 +18,7 @@
 
 Scratch is a free programming language and online community where you can create your own interactive stories, games, and animations.
 
-**Поставляемая версия:** 4.1.3~ynh1
+**Поставляемая версия:** 4.1.3~jaf1
 
 **Демо-версия:** <https://scratch.mit.edu/projects/editor/?tutorial=getStarted>
 

README_zh_Hans.md

@@ -18,7 +18,7 @@
 
 Scratch is a free programming language and online community where you can create your own interactive stories, games, and animations.
 
-**分发版本：** 4.1.3~ynh1
+**分发版本：** 4.1.3~jaf1
 
 **演示：** <https://scratch.mit.edu/projects/editor/?tutorial=getStarted>
 

manifest.toml

@@ -7,7 +7,7 @@ name = "Scratch"
 description.en = "Programming language to create your own interactive stories, games, and animations"
 description.fr = "Langage de programmation pour créer vos propres histoires, jeux et animations interactifs"
 
-version = "4.1.3~ynh1"
+version = "4.1.3~jaf1"
 
 maintainers = []
 
@@ -45,9 +45,9 @@ ram.runtime = "50M"
 
 [resources]
     [resources.sources.main]
-    url = "https://github.com/scratchfoundation/scratch-gui/archive/refs/tags/v4.1.3.tar.gz"
+    url = "https://jo.trax.im/api/packages/julianfoad/generic/scratch-gui-dist/4.1.3/scratch-gui-dist-4.1.3.tar.gz"
-    sha256 = "77283288fa9a8bbad9a02099d6bfc9180244d23ae7011e4c4b97953c509705ac"
+    sha256 = "54a520f30b204c7829f932c1413cbaff956f197411d14190cf721e527d7e854a"
-    autoupdate.strategy = "latest_github_tag"
+    #autoupdate.strategy = "..."
 
     [resources.system_user]
 

scripts/_common.sh

@@ -4,9 +4,6 @@
 # COMMON VARIABLES
 #=================================================
 
-# NodeJS version
-nodejs_version=18
-
 #=================================================
 # PERSONAL HELPERS
 #=================================================

scripts/install

@@ -12,9 +12,6 @@ source /usr/share/yunohost/helpers
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Installing nodejs..." --weight=50
-
-ynh_install_nodejs --nodejs_version=$nodejs_version
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -22,7 +19,7 @@ ynh_install_nodejs --nodejs_version=$nodejs_version
 ynh_script_progression --message="Setting up source files..." --weight=5
 
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$install_dir/sources"
+ynh_setup_source --dest_dir="$install_dir/www"
 
 chmod -R o-rwx "$install_dir"
 chown -R "$app:www-data" "$install_dir"
@@ -30,18 +27,6 @@ chown -R "$app:www-data" "$install_dir"
 #=================================================
 # Build
 #=================================================
-ynh_script_progression --message="Installing $app..." --weight=40
-
-pushd "$install_dir/sources"
-    ynh_use_nodejs
-    ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" "$ynh_npm" install
-    ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" BUILD_MODE=dist "$ynh_npm" run build
-popd
-
-mv "$install_dir/sources/build" "$install_dir/www"
-ynh_secure_remove --file="$install_dir/sources"
-
-chown -R "$app:www-data" "$install_dir"
 
 #=================================================
 # SYSTEM CONFIGURATION

scripts/remove

@@ -14,8 +14,6 @@ ynh_script_progression --message="Removing system configurations related to $app
 
 ynh_remove_nginx_config
 
-ynh_remove_nodejs
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/restore

@@ -23,8 +23,6 @@ chown -R "$app:www-data" "$install_dir"
 #=================================================
 ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1
 
-ynh_install_nodejs --nodejs_version="$nodejs_version"
-
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================

scripts/upgrade

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+#=================================================
+# GENERIC START
 #=================================================
 # IMPORT GENERIC HELPERS
 #=================================================
@@ -10,9 +12,6 @@ source /usr/share/yunohost/helpers
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Installing nodejs..."
-
-ynh_install_nodejs --nodejs_version=$nodejs_version
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -20,7 +19,7 @@ ynh_install_nodejs --nodejs_version=$nodejs_version
 ynh_script_progression --message="Upgrading source files..." --weight=5
 
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$install_dir/sources" --full_replace=1
+ynh_setup_source --dest_dir="$install_dir/www" --full_replace=1
 
 chmod -R o-rwx "$install_dir"
 chown -R "$app:www-data" "$install_dir"
@@ -28,19 +27,6 @@ chown -R "$app:www-data" "$install_dir"
 #=================================================
 # Build
 #=================================================
-ynh_script_progression --message="Installing $app..." --weight=40
-
-pushd "$install_dir/sources"
-    ynh_use_nodejs
-    ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" "$ynh_npm" install
-    ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" BUILD_MODE=dist "$ynh_npm" run build
-popd
-
-ynh_secure_remove --file="$install_dir/www"
-mv "$install_dir/sources/build" "$install_dir/www"
-ynh_secure_remove --file="$install_dir/sources"
-
-chown -R "$app:www-data" "$install_dir"
 
 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS