From c354b804084a312a48a928c2ad817c6a85dd15e3 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Sat, 9 Jun 2018 00:03:36 +0200 Subject: [PATCH 1/3] Upgrade to 14.1 --- check_process | 6 +++--- conf/app-frontend.src | 4 ++-- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/check_process b/check_process index b1c1cb4..fd66c12 100644 --- a/check_process +++ b/check_process @@ -17,7 +17,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=5d26c33b91a98c7e9e830edbd7150a3cc9a1e7dd + upgrade=1 from_commit=2d2aedf3dac89e47f4c7083c0b9f55988ab3de54 backup_restore=1 multi_instance=1 incorrect_path=0 @@ -40,6 +40,6 @@ Email=jean-baptiste@holcroft.fr Notification=all ;;; Upgrade options - ; commit=5d26c33b91a98c7e9e830edbd7150a3cc9a1e7dd - name=Upgrade from 0.13 + ; commit=2d2aedf3dac89e47f4c7083c0b9f55988ab3de54 + name=Upgrade from 0.14 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1 \ No newline at end of file diff --git a/conf/app-frontend.src b/conf/app-frontend.src index f73ea8e..e65f664 100644 --- a/conf/app-frontend.src +++ b/conf/app-frontend.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/jobs/artifacts/0.14/download?job=build_front -SOURCE_SUM=74bd307956f0c2f7acb3b34e93d7dd6af65b6ec8b4f285906ceb87922d6e11d6 +SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/jobs/artifacts/0.14.1/download?job=build_front +SOURCE_SUM=09ae4f46949ada8e473990f35afb098a516dd2608cc9d1c7203f7ba40eaecc3c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/conf/app.src b/conf/app.src index 2267aa2..f60f218 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/archive/0.14/funkwhale-0.14.tar.bz2 -SOURCE_SUM=42fab2642345a8e5f0294429116c26f8cfede624148aa61d44517bfd9397507d +SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/archive/0.14.1/funkwhale-0.14.1.tar.bz2 +SOURCE_SUM=6c930ba162842619c60c9bc5ec6287df2cba2088725eab1890c9eab42622a867 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.bz2 SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index a49b22f..6a5108a 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ "description": { "en": "A modern, convivial and free music server" }, - "version": "0.14.0~ynh1", + "version": "0.14.1~ynh1", "url": "https://funkwhale.audio", "license": "BSD-3-Clause", "maintainer": { From c7080bd6d881313d9752bbdf48b45a205fed687b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Sun, 17 Jun 2018 15:53:23 +0200 Subject: [PATCH 2/3] Upgrade to 0.14.2 --- conf/app-frontend.src | 4 ++-- conf/app.src | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app-frontend.src b/conf/app-frontend.src index e65f664..cee835f 100644 --- a/conf/app-frontend.src +++ b/conf/app-frontend.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/jobs/artifacts/0.14.1/download?job=build_front -SOURCE_SUM=09ae4f46949ada8e473990f35afb098a516dd2608cc9d1c7203f7ba40eaecc3c +SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/jobs/artifacts/0.14.2/download?job=build_front +SOURCE_SUM=6bf6cd1ac5ffaf7cf4770321d2dbeff5e54e8df4ee5b0dc2813ff898569270bf SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/conf/app.src b/conf/app.src index f60f218..f6ad716 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/archive/0.14.1/funkwhale-0.14.1.tar.bz2 -SOURCE_SUM=6c930ba162842619c60c9bc5ec6287df2cba2088725eab1890c9eab42622a867 +SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/archive/0.14.2/funkwhale-0.14.2.tar.bz2 +SOURCE_SUM=1e617d549e43a604e9c553fdceef1cebb36a6586f58c0f44f62f2db7407fb83b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.bz2 SOURCE_IN_SUBDIR=true From 5e6cbb6ae3d232606ada8f9cb5bb7a5c403142de Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Sun, 17 Jun 2018 15:54:08 +0200 Subject: [PATCH 3/3] Remove path from manifest and improve readme --- README.md | 18 +++++++++++++++--- check_process | 3 +-- manifest.json | 11 +---------- scripts/install | 2 +- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 2f75a7e..a6a3f35 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,18 @@ -# funkwhale_ynh +# Funkwhale A modern, convivial and free music server on YunoHost -Installation has to be done on root for now. I'm working on enabling it in subpath. +[![Install Funkwhale with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=funkwhale) -Admin passwork is **funkwhale**, login is what you provied at installation. \ No newline at end of file +Installation requires a dedicated domain for now. I hope subpath installation will be possible in the future. + +**Shipped version:** 0.14.2 + +## Admin + +Admin password is **funkwhale**, login is the user you provided at installation. + +## Links + + * Report a bug: https://github.com/YunoHost-Apps/funkwhale_ynh/ + * Funkwhale website: https://funkwhale.audio/ + * YunoHost website: https://yunohost.org/ \ No newline at end of file diff --git a/check_process b/check_process index fd66c12..60ef34f 100644 --- a/check_process +++ b/check_process @@ -6,7 +6,6 @@ ;; Test complet ; Manifest domain="domain.tld" (DOMAIN) - path="/" (PATH) admin="john" (USER) is_public=1 (PUBLIC|public=1|private=0) ; Checks @@ -42,4 +41,4 @@ Notification=all ;;; Upgrade options ; commit=2d2aedf3dac89e47f4c7083c0b9f55988ab3de54 name=Upgrade from 0.14 -manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1 \ No newline at end of file +manifest_arg=domain=DOMAIN&path=/&admin=USER&is_public=1 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 6a5108a..e90a056 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ "description": { "en": "A modern, convivial and free music server" }, - "version": "0.14.1~ynh1", + "version": "0.14.2~ynh1", "url": "https://funkwhale.audio", "license": "BSD-3-Clause", "maintainer": { @@ -29,15 +29,6 @@ }, "example": "domain.fr" }, - { - "name": "path", - "type": "path", - "ask": { - "en": "Choose a path (for now, only / works)" - }, - "example": "/", - "default": "/" - }, { "name": "is_public", "type": "boolean", diff --git a/scripts/install b/scripts/install index 2db51f2..21f76a4 100644 --- a/scripts/install +++ b/scripts/install @@ -21,7 +21,7 @@ ynh_abort_if_errors #================================================= domain=$YNH_APP_ARG_DOMAIN -path_url=$YNH_APP_ARG_PATH +path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC admin=$YNH_APP_ARG_ADMIN