From 11e5db370a3c921d54301dd0715d0dbb4a38cd69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 6 Aug 2022 14:01:05 +0200 Subject: [PATCH 1/2] Testing (#80) * cleaning (#77) * Update upgrade * 2.4.2 (#79) * 2.4.2 * Auto-update README Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/upgrade | 2 -- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b001677..16b31b3 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ CodiMD is the free software version of HackMD, developed and opened source by th CodiMD is perfect for open communities, while HackMD emphasizes on permission and access controls for commercial use cases. -**Shipped version:** 2.4.1~ynh6 +**Shipped version:** 2.4.2~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 909a95f..8f9e5a2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ CodiMD est la version logicielle libre de HackMD, développée et ouverte par l' CodiMD est parfait pour les communautés ouvertes, tandis que HackMD met l'accent sur les autorisations et les contrôles d'accès pour les cas d'utilisation commerciale. -**Version incluse :** 2.4.1~ynh6 +**Version incluse :** 2.4.2~ynh1 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index b97c2a9..d6d3cf0 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/hackmdio/codimd/archive/refs/tags/2.4.1.tar.gz -SOURCE_SUM=3bf516ca447aefc2c3ca9f94c76eeb1d1a14d4a0e24dca044b87ea89f1acdf73 +SOURCE_URL=https://github.com/hackmdio/codimd/archive/refs/tags/2.4.2.tar.gz +SOURCE_SUM=ba471b58ac0b3307544311eddc99afc27df8dbd07cd85bf2f4f9687e80cf0730 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 17ffbb5..424cf31 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Collaborative editor to work on notes written in Markdown", "fr": "Éditeur collaboratif pour travailler sur des notes en Markdown" }, - "version": "2.4.1~ynh6", + "version": "2.4.2~ynh1", "url": "https://github.com/hackmdio/codimd", "upstream": { "license": "AGPL-3.0-only", diff --git a/scripts/upgrade b/scripts/upgrade index 17b9905..eb9c4c2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -138,8 +138,6 @@ then ynh_use_nodejs ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH bin/setup ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm run build - #ynh_exec_warn_less ynh_exec_warn_less bin/setup - #ynh_exec_warn_less ynh_exec_warn_less $ynh_npm run build popd fi From d9e4f3bf8fa3ead322fa1c8e7dab3935c1c0f177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 22 Oct 2022 11:42:36 +0200 Subject: [PATCH 2/2] Testing (#83) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * cleaning (#77) * Update upgrade * 2.4.2 (#79) * 2.4.2 * Auto-update README Co-authored-by: yunohost-bot * [autopatch] Add Common Platform Enumeration id to `manifest.json` (#81) * Testing (#80) * cleaning (#77) * Update upgrade * 2.4.2 (#79) * 2.4.2 * Auto-update README Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot * [autopatch] Add Common Platform Enumeration id to `manifest.json` Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: Yunohost-Bot <> * set relative path for --keep opt * Auto-update README * Update install * Auto-update README Co-authored-by: yunohost-bot Co-authored-by: YunoHost Bot --- manifest.json | 7 ++++--- scripts/install | 6 ++++++ scripts/upgrade | 19 +------------------ 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/manifest.json b/manifest.json index 424cf31..d68d954 100644 --- a/manifest.json +++ b/manifest.json @@ -13,7 +13,8 @@ "website": "https://hackmd.io/", "admindoc": "https://hackmd.io/c/codimd-documentation/%2Fs%2Fcodimd-documentation#Administration-Guides", "userdoc": "https://hackmd.io/c/codimd-documentation/%2Fs%2Fcodimd-documentation#User-Guides", - "code": "https://github.com/hackmdio/codimd" + "code": "https://github.com/hackmdio/codimd", + "cpe": "cpe:2.3:a:hackmd:codimd" }, "license": "AGPL-3.0-only", "maintainer": { @@ -27,7 +28,7 @@ "nginx" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" @@ -43,4 +44,4 @@ } ] } -} +} \ No newline at end of file diff --git a/scripts/install b/scripts/install index 4548150..ac64594 100644 --- a/scripts/install +++ b/scripts/install @@ -34,6 +34,12 @@ app=$YNH_APP_INSTANCE_NAME #================================================= ynh_script_progression --message="Validating installation parameters..." --weight=1 +# Stop if architecture is ARM +case $YNH_ARCH in + arm*|armhf) ynh_die --message="Sorry, your architecture $YNH_ARCH is not supported by CodiMD. Aborting.";; + *) ;; +esac + final_path=/var/www/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" diff --git a/scripts/upgrade b/scripts/upgrade index eb9c4c2..ae76dee 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -82,25 +82,8 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=16 - # Create a temporary directory - #tmpdir="$(mktemp -d)" - - # Backup the config file in the temp dir - #cp -a "$final_path/config.json" "$tmpdir/config.json" - #cp -a "$final_path/.sequelizerc" "$tmpdir/.sequelizerc" - - # Remove the app directory securely - #ynh_secure_remove --file=$final_path - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir=$final_path --keep="$final_path/config.json $final_path/.sequelizerc" - - #Copy the admin saved settings from tmp directory to final path - #cp -a "$tmpdir/config.json" "$final_path/config.json" - #cp -a "$tmpdir/.sequelizerc" "$final_path/.sequelizerc" - - # Remove the tmp directory securely - #ynh_secure_remove --file="$tmpdir" + ynh_setup_source --dest_dir=$final_path --keep="config.json .sequelizerc" fi chmod 750 "$final_path"