diff --git a/conf/app.src b/conf/app.src
deleted file mode 100644
index a7727af..0000000
--- a/conf/app.src
+++ /dev/null
@@ -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=
diff --git a/manifest.json b/manifest.json
index f5fc5a1..65e9e4c 100644
--- a/manifest.json
+++ b/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": {
diff --git a/scripts/install b/scripts/install
index 3e61ec1..59fb85a 100644
--- a/scripts/install
+++ b/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 ../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
diff --git a/scripts/upgrade b/scripts/upgrade
index 689fddc..0be9abb 100644
--- a/scripts/upgrade
+++ b/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 ../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
diff --git a/sources/extra_files/app/CNAME b/sources/extra_files/app/CNAME
new file mode 100644
index 0000000..f268389
--- /dev/null
+++ b/sources/extra_files/app/CNAME
@@ -0,0 +1 @@
+app.keeweb.info
diff --git a/sources/extra_files/app/browserconfig.xml b/sources/extra_files/app/browserconfig.xml
new file mode 100644
index 0000000..57b24d9
--- /dev/null
+++ b/sources/extra_files/app/browserconfig.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+ #6386ec
+
+
+
diff --git a/sources/extra_files/app/icons/android-chrome-192x192.png b/sources/extra_files/app/icons/android-chrome-192x192.png
new file mode 100644
index 0000000..b4887a6
Binary files /dev/null and b/sources/extra_files/app/icons/android-chrome-192x192.png differ
diff --git a/sources/extra_files/app/icons/android-chrome-512x512.png b/sources/extra_files/app/icons/android-chrome-512x512.png
new file mode 100644
index 0000000..aec9d2b
Binary files /dev/null and b/sources/extra_files/app/icons/android-chrome-512x512.png differ
diff --git a/sources/extra_files/app/icons/apple-touch-icon.png b/sources/extra_files/app/icons/apple-touch-icon.png
new file mode 100644
index 0000000..b31afc2
Binary files /dev/null and b/sources/extra_files/app/icons/apple-touch-icon.png differ
diff --git a/sources/extra_files/app/icons/favicon-16x16.png b/sources/extra_files/app/icons/favicon-16x16.png
new file mode 100644
index 0000000..a8f0ad8
Binary files /dev/null and b/sources/extra_files/app/icons/favicon-16x16.png differ
diff --git a/sources/extra_files/app/icons/favicon-32x32.png b/sources/extra_files/app/icons/favicon-32x32.png
new file mode 100644
index 0000000..2891222
Binary files /dev/null and b/sources/extra_files/app/icons/favicon-32x32.png differ
diff --git a/sources/extra_files/app/icons/mstile-150x150.png b/sources/extra_files/app/icons/mstile-150x150.png
new file mode 100644
index 0000000..280ec04
Binary files /dev/null and b/sources/extra_files/app/icons/mstile-150x150.png differ
diff --git a/sources/extra_files/app/icons/mstile-310x150.png b/sources/extra_files/app/icons/mstile-310x150.png
new file mode 100644
index 0000000..fe8c793
Binary files /dev/null and b/sources/extra_files/app/icons/mstile-310x150.png differ
diff --git a/sources/extra_files/app/icons/mstile-310x310.png b/sources/extra_files/app/icons/mstile-310x310.png
new file mode 100644
index 0000000..b096933
Binary files /dev/null and b/sources/extra_files/app/icons/mstile-310x310.png differ
diff --git a/sources/extra_files/app/icons/mstile-70x70.png b/sources/extra_files/app/icons/mstile-70x70.png
new file mode 100644
index 0000000..bf89385
Binary files /dev/null and b/sources/extra_files/app/icons/mstile-70x70.png differ
diff --git a/sources/extra_files/app/icons/safari-pinned-tab.svg b/sources/extra_files/app/icons/safari-pinned-tab.svg
new file mode 100644
index 0000000..15ee7a3
--- /dev/null
+++ b/sources/extra_files/app/icons/safari-pinned-tab.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/sources/extra_files/app/index.html b/sources/extra_files/app/index.html
new file mode 100644
index 0000000..80fe162
--- /dev/null
+++ b/sources/extra_files/app/index.html
@@ -0,0 +1,12 @@
+KeeWeb
\ No newline at end of file
diff --git a/sources/extra_files/app/manifest.appcache b/sources/extra_files/app/manifest.appcache
new file mode 100644
index 0000000..5af265a
--- /dev/null
+++ b/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:
+*
diff --git a/sources/extra_files/app/manifest.json b/sources/extra_files/app/manifest.json
new file mode 100644
index 0000000..1e1460f
--- /dev/null
+++ b/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"
+ }
+ ]
+}