Merge pull request #14 from YunoHost-Apps/testing

Fix keeweb

conf/app.src

@@ -1,6 +0,0 @@
-SOURCE_URL=https://github.com/keeweb/keeweb/archive/v1.7.7.tar.gz
-SOURCE_SUM=cd36bd933c7f948d02be9beb02fe0ecdb46e630b875fbeebb42cb0a7558191af
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=

conf/nginx.conf

@@ -1,6 +1,6 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
-	alias __FINALPATH__/app/;
+	alias __FINALPATH__/;
 
 	if ($scheme = http) {
 		rewrite ^ https://$server_name$request_uri? permanent;

manifest.json

@@ -6,7 +6,7 @@
 		"en": "Password manager compatible with KeePass.",
 		"fr": "Gestionnaire de mots de passe compatible avec KeePass."
 	},
-	"version": "1.7.7~ynh2",
+	"version": "1.7.7~ynh3",
 	"url": "https://keeweb.info/",
 	"license": "MIT",
 	"maintainer": {

scripts/install

@@ -52,15 +52,18 @@ ynh_webpath_register $app $domain $path_url
 ynh_app_setting_set $app domain $domain
 ynh_app_setting_set $app path $path_url
 ynh_app_setting_set $app is_public $is_public
+ynh_app_setting_set $app final_path $final_path
 
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
-# DOWNLOAD, CHECK AND UNPACK SOURCE
+# INSTALL SOURCES
 #=================================================
 
-ynh_app_setting_set $app final_path $final_path
-ynh_setup_source "$final_path"	# Télécharge la source, décompresse et copie dans $final_path
+# To avoid a complete rebuild, I downloaded the gh-pages as explained here: https://github.com/keeweb/keeweb#self-hosting
+# and put all files in "../sources/extra_files/app/", like that I can assure the version install in YunoHost is the version described in the manifest
+mkdir -p "$final_path"
+cp -r ../sources/extra_files/app/* "$final_path"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -74,20 +77,20 @@ ynh_add_nginx_config
 # USE THE CONFIG FILE
 #=================================================
 
-ynh_replace_string "(no-config)" "config.json" "$final_path/app/index.html"
+ynh_replace_string "(no-config)" "config.json" "$final_path/index.html"
 
 #=================================================
 # COPY THE CONFIG FILE
 #=================================================
 
-cp ../conf/config.json "$final_path/app/"
+cp ../conf/config.json "$final_path/"
 
 #=================================================
 # STORE THE CHECKSUM OF THE CONFIG FILE
 #=================================================
 
 # Enregistre la somme de contrôle du fichier de config
-ynh_store_file_checksum "$final_path/app/config.json"
+ynh_store_file_checksum "$final_path/config.json"
 
 #=================================================
 # GENERIC FINALISATION

scripts/upgrade

@@ -71,13 +71,11 @@ ynh_maintenance_mode_ON
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
-# DOWNLOAD, CHECK AND UNPACK SOURCE
+# INSTALL SOURCES
 #=================================================
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-	ynh_setup_source "$final_path"	# Télécharge la source, décompresse et copie dans $final_path
-fi
+mkdir -p "$final_path"
+cp -r ../sources/extra_files/app/* "$final_path"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -91,16 +89,16 @@ ynh_add_nginx_config
 # USE THE CONFIG FILE
 #=================================================
 
-ynh_replace_string "(no-config)" "config.json" "$final_path/app/index.html"
+ynh_replace_string "(no-config)" "config.json" "$final_path/index.html"
 
 #=================================================
 # COPY THE CONFIG FILE
 #=================================================
 
 # Copie ou modification d'un fichier de config
-ynh_backup_if_checksum_is_different "$final_path/app/config.json"	# Créé un backup du fichier de config si il a été modifié.
-cp ../conf/config.json "$final_path/app/"
-ynh_store_file_checksum "$final_path/app/config.json"	# Réenregistre la somme de contrôle du fichier de config
+ynh_backup_if_checksum_is_different "$final_path/config.json"	# Créé un backup du fichier de config si il a été modifié.
+cp ../conf/config.json "$final_path/"
+ynh_store_file_checksum "$final_path/config.json"	# Réenregistre la somme de contrôle du fichier de config
 
 #=================================================
 # GENERIC FINALISATION

sources/extra_files/app/CNAME

@@ -0,0 +1 @@
+app.keeweb.info

sources/extra_files/app/browserconfig.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square70x70logo src="/icons/mstile-70x70.png"/>
+            <square150x150logo src="/icons/mstile-150x150.png"/>
+            <square310x310logo src="/icons/mstile-310x310.png"/>
+            <wide310x150logo src="/icons/mstile-310x150.png"/>
+            <TileColor>#6386ec</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>

sources/extra_files/app/icons/safari-pinned-tab.svg

@@ -0,0 +1 @@
+<svg version="1" xmlns="http://www.w3.org/2000/svg" width="922.667" height="922.667" viewBox="0 0 692.000000 692.000000"><path d="M266.9 57.4c-.2.2-4 .6-8.3 1-4.4.4-8.2.8-8.5 1-.3.2-2.7.7-5.3 1-5.5.7-21.6 4.8-29.8 7.5-46.3 15.4-93.3 48.9-126.5 90.1-25.7 31.8-46.8 74.8-52.9 107.4-.5 2.8-1.5 8.3-2.1 12.1-1.9 11.6-2.6 35.9-1.3 45 .3 2.7.9 7 1.2 9.5 3.3 27.4 16.9 55.4 36.1 74.5 12.1 12.1 27.3 22.7 40 27.8 3.9 1.6 7.9 3.3 9 3.7 1.1.5 4.3 1.5 7 2.4 4.4 1.3 7.1 1.9 18.5 4.1 12.1 2.4 42.4 2.4 56.5 0 1.7-.3 4.4-.7 6-1 1.7-.3 4.1-.7 5.5-1 1.4-.3 3.7-.7 5.1-1 4.5-.8 19.1-5.2 28.4-8.6 16.8-6.1 42.9-20.2 59.4-32.2l5.3-3.9 130.7 130.5C567.7 654 571.7 657.8 577.5 660c6.2 2.2 15.3 2.9 21.4 1.6 12.8-2.7 27.8-15.7 34.7-30.1 2.5-5.3 2.9-7.1 2.9-15-.1-15.8 1.1-14.3-49.6-65.1l-44-44 18.1-18.2 18.1-18.1 6.7 7.1c20.7 21.9 32.6 32.8 38.6 35.3 5.6 2.4 11.5-1.2 26.5-15.8 16.1-15.8 21.8-23.8 20-28.6-.9-2.3-4.6-7.8-7.4-10.7-.5-.6-4.1-4.8-8-9.2-7.2-8.3-64.7-65.9-91-91.1-8.2-7.9-16-14.7-17.3-15.2-6.8-2.6-12.6.8-28.4 16.3-13.1 12.9-19.8 21.8-19.8 26.3 0 5.6 13.3 21 37.4 43.4l5.8 5.4-18.1 18.1-18.1 18.1-67-67c-36.9-36.8-67-67.3-67-67.7 0-.4 3-5.1 6.7-10.4 16.1-23.5 30.3-53.8 35.8-76.4.7-2.8 4.3-22.5 5.3-28.5 1.1-6.5.8-41.1-.3-48.5-1.4-9.2-6.4-26.8-10-35.3-9.9-23.3-28.4-44.9-50.5-58.8-21.8-13.8-47.4-20.5-78.6-20.7-7.3-.1-13.3 0-13.5.2zm22 74c12.1 2.8 22.6 7.6 31.1 14.4 13.3 10.7 23.7 27.4 26.3 42.7 6 34.4-9.5 65.3-40.5 80.7-16.1 7.9-40.9 8.5-58.1 1.3-4.4-1.8-5.2-1.9-4-.3 1.1 1.4 4 9.8 4.8 13.9 5.3 25.7-.6 47.7-17.7 66-8.9 9.6-19.7 16.4-31.3 19.8-9.7 2.9-11.7 3.1-22.2 3.2-24.8 0-47.2-12.3-61-33.3-15.4-23.7-15.3-56.4.4-79.3 11.1-16.2 26.6-27.1 44.3-31.1 14.4-3.2 32.9-1.7 43.9 3.7 2 .9 3.7 1.6 3.8 1.5.2-.2-.8-3.4-2.2-7.3-3.4-9.7-3.7-11.4-4-23.3-.4-17.1 3.8-30.7 13.8-44 11.4-15.2 26.5-24.8 44.7-28.4 6.2-1.2 22.9-1.4 27.9-.2z"/></svg>

sources/extra_files/app/manifest.appcache

@@ -0,0 +1,10 @@
+CACHE MANIFEST
+
+# 2019-02-09:v1.7.7
+# updmin:v4.0.1
+
+CACHE:
+index.html
+
+NETWORK:
+*

sources/extra_files/app/manifest.json

@@ -0,0 +1,21 @@
+{
+  "name": "KeeWeb",
+  "short_name": "KeeWeb",
+  "description": "Free cross-platform password manager compatible with KeePass",
+  "display": "standalone",
+  "orientation": "any",
+  "theme_color": "#6386ec",
+  "background_color": "#6386ec",
+  "icons": [
+    {
+      "src": "icons/android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "icons/android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ]
+}