From 361093273e167641aba5695c5211a25a7460397d Mon Sep 17 00:00:00 2001 From: ljf Date: Sun, 27 May 2018 05:29:07 +0200 Subject: [PATCH] [enh] Use sources from MohannadNaj's strut fork --- conf/app.src | 6 +++--- manifest.json | 2 +- scripts/install | 5 ++++- scripts/upgrade | 5 ++++- sources/patches/app-00-remove-google.patch | 25 ++++++++++++++++++++++ 5 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 sources/patches/app-00-remove-google.patch diff --git a/conf/app.src b/conf/app.src index 59cb09e..e74c1cc 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/strut_ynh/archive/ebd1e859cb1ecc0cc3166969fc1db649f3ddb61c.tar.gz -SOURCE_SUM=9829a1d97f4b3da2e898c7858ce60686a2fe2354001a166a62403a9efdda3c15 +SOURCE_URL=https://github.com/MohannadNaj/Strut/archive/467fcb8a6436c84f2acb8ffb31b954d5eb3655b8.tar.gz +SOURCE_SUM=d138ec3116b507d1fc3608f0c8bbb7601a68824403cb20617a80af1906bff3ab SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=strut-20160915-2.tar.gz +SOURCE_FILENAME=strut-20160915-3.tar.gz diff --git a/manifest.json b/manifest.json index 4c7df1e..dab9586 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Strut", "id": "strut", "packaging_format": 1, - "version": "20160915-2", + "version": "20171224-1", "url": "http://strut.io", "license": "AGPL-3.0", "requirements": { diff --git a/scripts/install b/scripts/install index 3564ccd..363394b 100644 --- a/scripts/install +++ b/scripts/install @@ -47,7 +47,10 @@ ynh_clean_setup () { ynh_secure_remove "$tmp_dir" } ynh_setup_source "$tmp_dir" -mv "$tmp_dir/sources" "$final_path" +mv "$tmp_dir/dist" "$final_path" +# Imgur is deactivated on the specific upstream selected, but this text is still here +# Don't use a patch because it's minified js +ynh_replace_string "are currently uploaded to imgur.*re working on changing this" "size is limited" "$final_path/scripts/amd-app.js" ynh_secure_remove "$tmp_dir" #================================================= # NGINX CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 3a6c623..f88d22f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -75,7 +75,10 @@ path_url=$(ynh_normalize_url_path $path_url) # For this app sources are in app subdirectory tmp_dir=$(mktemp -d) ynh_setup_source "$tmp_dir" -cp -R "$tmp_dir/sources/." "$final_path/" +cp -R "$tmp_dir/dist/." "$final_path/" +# Imgur is deactivated on the specific upstream selected, but this text is still here +# Don't use a patch because it's minified js +ynh_replace_string "are currently uploaded to imgur.*re working on changing this" "size is limited" "$final_path/scripts/amd-app.js" ynh_secure_remove "$tmp_dir" #================================================= diff --git a/sources/patches/app-00-remove-google.patch b/sources/patches/app-00-remove-google.patch new file mode 100644 index 0000000..de2f090 --- /dev/null +++ b/sources/patches/app-00-remove-google.patch @@ -0,0 +1,25 @@ +--- a/dist/index.html ++++ b/dist/index.html +@@ -15,15 +15,6 @@ + + + +- + + +