From 640fa2770a7f3b4250798a9e02769b50cf77df9d Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Wed, 3 Jun 2020 19:42:02 +0200 Subject: [PATCH] commnet helper-update-version --- README.md | 6 +++--- helper-update-version.sh | 22 +++++++++++----------- scripts/install | 4 +--- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index c804b08..425c4e8 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # Cesium package for YunoHost -[![Integration level](https://dash.yunohost.org/integration/cesium.svg)](https://dash.yunohost.org/appci/app/cesium) ![](https://ci-apps.yunohost.org/ci/badges/cesium.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/cesium.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/cesium.svg)](https://dash.yunohost.org/appci/app/cesium) ![](https://ci-apps.yunohost.org/ci/badges/cesium.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/cesium.maintain.svg) [![Install Custom Webapp with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=cesium) -> *This package allow you to install Cesium quickly and simply on a YunoHost server. +> *This package allow you to install Cesium quickly and simply on a YunoHost server. If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* ## Overview @@ -12,7 +12,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to [Cesium](https://cesium.app) is an [Unhosted webapp](https://unhosted.org) client for any [Duniter](https://duniter.org) crypto-currency. It allows you to manage your wallet, certify your friends, and more ! -**Shipped version:** v1.6.3 +**Shipped version:** v1.6.7 ## Links diff --git a/helper-update-version.sh b/helper-update-version.sh index 070a7cc..11c1c0d 100755 --- a/helper-update-version.sh +++ b/helper-update-version.sh @@ -1,16 +1,16 @@ #!/bin/bash # Retrieve sources, get sha256sum, parse package version and update these strings in manifest, README and /conf/app.src - -URL=$(curl -s https://api.github.com/repos/duniter/cesium/releases/latest | grep "browser_" | grep "web" | head -1 | cut -d\" -f4) -wget -nc --quiet $URL -P ./tmp -CHECKSUM=$(sha256sum ./tmp/cesium-*-web.zip | head -c 64) -sed -i "s/SOURCE_SUM=.*/SOURCE_SUM=${CHECKSUM}/" ./conf/app.src -sed -i "s#SOURCE_URL=.*#SOURCE_URL=$URL#" ./conf/app.src -VERSION=$(echo $URL | sed "s#https://github.com/duniter/cesium/releases/download/\(.*\)/cesium.*#\1#") -sed -i "s#\*\*Shipped version:\*\*.*#\*\*Shipped version:\*\* ${VERSION}#" ./README.md -sed -i "s# \"version\": \".*# \"version\": \"${VERSION}\~ynh1\",#" ./manifest.json +# URL=$(curl -s https://api.github.com/repos/duniter/cesium/releases/ | grep "browser_" | grep "web" | head -1 | cut -d\" -f4) +# wget -nc --quiet $URL -P ./tmp +# CHECKSUM=$(sha256sum ./tmp/cesium-*-web.zip | head -c 64) +# sed -i "s/SOURCE_SUM=.*/SOURCE_SUM=${CHECKSUM}/" ./conf/app.src +# sed -i "s#SOURCE_URL=.*#SOURCE_URL=$URL#" ./conf/app.src -rm -f -R ./tmp +# VERSION=$(echo $URL | sed "s#https://github.com/duniter/cesium/releases/download/\(.*\)/cesium.*#\1#") +# sed -i "s#\*\*Shipped version:\*\*.*#\*\*Shipped version:\*\* ${VERSION}#" ./README.md +# sed -i "s# \"version\": \".*# \"version\": \"${VERSION}\~ynh1\",#" ./manifest.json -git commit README.md manifest.json conf/app.src -m "$VERSION" +# rm -f -R ./tmp + +# git commit README.md manifest.json conf/app.src -m "$VERSION" diff --git a/scripts/install b/scripts/install index fc527ab..2f223f6 100755 --- a/scripts/install +++ b/scripts/install @@ -33,14 +33,12 @@ sed -i "s@YNH_WWW_PATH@$path@g" $nginx_conf sed -i "s@YNH_WWW_ALIAS@$src_path/@g" $nginx_conf cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf - - # If app is public, add url to SSOWat conf as skipped_uris if [[ $is_public -eq 1 ]]; then # unprotected_uris allows SSO credentials to be passed anyway. ynh_app_setting_set "$app" unprotected_uris "/" # activate read-only -ynh_replace_string --match_string='"readonly": false,' --replace_string='"readonly": true,' --target_file="$src_path/config.js" + ynh_replace_string --match_string='"readonly": false,' --replace_string='"readonly": true,' --target_file="$src_path/config.js" fi # Reload nginx service