diff --git a/README.md b/README.md index 3d408ff..03f394b 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Running your own URL shortener is fun, geeky and useful: you own your data and d - Sample files to create your own public interface -**Shipped version:** 1.9.2~ynh1 +**Shipped version:** 1.9.2~ynh2 **Demo:** https://yourls.org/cookie+ diff --git a/README_fr.md b/README_fr.md index dc79b0c..dfcbd95 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Running your own URL shortener is fun, geeky and useful: you own your data and d - Sample files to create your own public interface -**Version incluse :** 1.9.2~ynh1 +**Version incluse :** 1.9.2~ynh2 **Démo :** https://yourls.org/cookie+ diff --git a/check_process b/check_process deleted file mode 100644 index f15a0e2..0000000 --- a/check_process +++ /dev/null @@ -1,26 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - path="/path" - admin="john" - language="fr_FR" - password="1Strong-Password" - ; Checks - pkg_linter=1 - setup_sub_dir=1 - setup_root=1 - setup_nourl=0 - setup_private=0 - setup_public=1 - upgrade=1 - upgrade=1 from_commit=455317a9e0a55ffb2cb80f79f2a2f56af4d3d671 - backup_restore=1 - multi_instance=1 - change_url=1 -;;; Options -Email= -Notification=none -;;; Upgrade options - ; commit=455317a9e0a55ffb2cb80f79f2a2f56af4d3d671 - name=Merge pull request #17 - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& diff --git a/conf/fr.src b/conf/fr.src deleted file mode 100644 index 58eb1b6..0000000 --- a/conf/fr.src +++ /dev/null @@ -1,5 +0,0 @@ -SOURCE_URL=https://github.com/ozh/YOURLS-fr_FR/archive/refs/tags/1.8.zip -SOURCE_SUM=ef9c0e71d4559994b9df0cd0a558f6faf11eba185c4793ba0e30f3500dab1b04 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip -SOURCE_IN_SUBDIR=true diff --git a/manifest.toml b/manifest.toml index dec2fd9..5a4c9c0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yourls" description.en = "URL shortening service" description.fr = "Service de raccourcisseur d'URL" -version = "1.9.2~ynh1" +version = "1.9.2~ynh2" maintainers = ["Anmol Sharma"] @@ -17,7 +17,7 @@ admindoc = "https://docs.yourls.org/" code = "https://github.com/YOURLS/YOURLS" [integration] -yunohost = ">= 11.1.13" +yunohost = ">= 11.1.15" architectures = "all" multi_instance = true ldap = false @@ -48,6 +48,17 @@ ram.runtime = "50M" default = "fr_FR" [resources] + + [resources.sources] + + [resources.sources.main] + url = "https://github.com/YOURLS/YOURLS/archive/1.9.2.zip" + sha256 = "65e242aaf007f86d7bf8f7f2776ee814a632a783749151d043d669512c3b41cb" + + [resources.sources.fr] + url = "https://github.com/ozh/YOURLS-fr_FR/archive/refs/tags/1.8.zip" + sha256 = "ef9c0e71d4559994b9df0cd0a558f6faf11eba185c4793ba0e30f3500dab1b04" + [resources.system_user] [resources.install_dir] diff --git a/scripts/install b/scripts/install index 7719778..129dbe9 100644 --- a/scripts/install +++ b/scripts/install @@ -70,9 +70,8 @@ chown $app:$app "$install_dir/user/config.php" #================================================= # SETUP APPLICATION WITH CURL #================================================= - -# Installation with curl ynh_script_progression --message="Finalizing installation..." --weight=1 + ynh_local_curl "admin/install.php" "install=dummy" #================================================= diff --git a/scripts/restore b/scripts/restore index 1569b7d..95c06fa 100644 --- a/scripts/restore +++ b/scripts/restore @@ -25,7 +25,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir"