Merge pull request #31 from YunoHost-Apps/upgrade

Upgrade to 15.0~ynh1

README.md

@@ -22,7 +22,7 @@ The main LibreERP Apps include an Open Source CRM, Website Builder, eCommerce, P
 LibreERP Apps can be used as stand-alone applications, but they also integrate seamlessly so you get a full-featured Open Source ERP when you install several Apps.
 
 
-**Shipped version:** 12.0~ynh6
+**Shipped version:** 15.0~ynh1
 
 **Demo:** https://www.odoo.com/trial
 ## Disclaimers / important information

README_fr.md

@@ -22,7 +22,7 @@ The main LibreERP Apps include an Open Source CRM, Website Builder, eCommerce, P
 LibreERP Apps can be used as stand-alone applications, but they also integrate seamlessly so you get a full-featured Open Source ERP when you install several Apps.
 
 
-**Version incluse :** 12.0~ynh6
+**Version incluse :** 15.0~ynh1
 
 **Démo :** https://www.odoo.com/trial
 ## Avertissements / informations importantes

check_process

@@ -1,12 +1,37 @@
-;; Test complet sans multisite
+;; Test complet sans multisite v14
 	auto_remove=1
 	; Manifest
 		domain="domain.tld"
 		version="14"
 		oca=0
-        admin_password="testpassw0rD"
 		lang="en_US"
 		tz="Etc/GMT"
+		admin="john"
+		password="1Strong-Password"
+	; Checks
+		pkg_linter=1
+		setup_sub_dir=0
+		setup_root=1
+		setup_nourl=0
+		setup_private=0
+		setup_public=1
+		upgrade=1
+		# 12.0~ynh6
+		upgrade=1	from_commit=54f28204591c902ebe4a3a6b662e88e8fa598fde
+		backup_restore=1
+		multi_instance=1
+		port_already_use=0
+		change_url=0
+;; Test complet sans multisite v15
+	auto_remove=1
+	; Manifest
+		domain="domain.tld"
+		version="15"
+		oca=0
+		lang="en_US"
+		tz="Etc/GMT"
+		admin="john"
+		password="1Strong-Password"
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=0
@@ -15,8 +40,6 @@
 		setup_private=0
 		setup_public=1
 		upgrade=1
-		# 12.0-6
-		# upgrade=1	from_commit=2cfdbc229faa8700873e681a01f823c32475cca8
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0

conf/10.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/odoo/odoo/archive/f69c004795e0a7f32d5c6243cc3d4915cf010bbe.tar.gz
+SOURCE_URL=https://github.com/odoo/odoo/archive/28c3f51c4878fbcd79b2e819948465fcf2160ebc.tar.gz
-SOURCE_SUM=79bfb272bc48509390386de357413e34bbb10fceee0662ca89e9e18383ed522f
+SOURCE_SUM=880be8b9e5a57e67d6645a527efd83224319d8fc645cbd72f24e7e50a75ff31d
 SOURCE_FILENAME=odoo-10.tar.gz
 SOURCE_FORMAT=tar.gz
 SOURCE_SUM_PRG=sha256sum

conf/11.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/odoo/odoo/archive/d129b0220eb0c76c8677c6ee0f60306f57cf2c8f.tar.gz
+SOURCE_URL=https://github.com/odoo/odoo/archive/43200e9dcc1d91cfd5c1e5e939b27e713d20cc7c.tar.gz
-SOURCE_SUM=2e209236c56b78bb410639f3f0c102479c37fdb293cb51d3f6fdd6ad20fa610f
+SOURCE_SUM=71418fc5536242de72baa2d17b38a439252956fbbb1ebc3e2294c858674c4659
 SOURCE_FILENAME=odoo-11.tar.gz
 SOURCE_FORMAT=tar.gz
 SOURCE_SUM_PRG=sha256sum

conf/12.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/odoo/odoo/archive/336c9aab3619abb5bfbeb07f87ae014facdefb0b.tar.gz
+SOURCE_URL=https://github.com/odoo/odoo/archive/04e37773d1bf9b885be674d85bdf0ec069926958.tar.gz
-SOURCE_SUM=3d37bc31383bfad827c3fdbab4daa3914ad036fd70fe1f20925ed18d2b9e1f87
+SOURCE_SUM=023afbaada2182cd6e54c0717915f7585e6899e2c23ad54d9f2372e88bcf35ec
 SOURCE_FILENAME=odoo-12.tar.gz
 SOURCE_FORMAT=tar.gz
 SOURCE_SUM_PRG=sha256sum

conf/14.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/odoo/odoo/archive/d8322e64c6d999ffc72093b2ef2db91532138c89.tar.gz
+SOURCE_URL=https://github.com/odoo/odoo/archive/5a8690b35a2fa9c5ed81d858ac0d170beaabaaf9.tar.gz
-SOURCE_SUM=40cbbc93ab594f614499ccdd04922590c420bfadeaf2f889853a5d58073e5fef
+SOURCE_SUM=b52829b5f01f39d8e9bd6977eb1b9c23053e92c7574ec26e5b3d218522fccf3a
 SOURCE_FILENAME=odoo-14.tar.gz
 SOURCE_FORMAT=tar.gz
 SOURCE_SUM_PRG=sha256sum

conf/15.src

@@ -0,0 +1,5 @@
+SOURCE_URL=https://github.com/odoo/odoo/archive/2354fade236b2853835761a129ef2c4ea450d728.tar.gz
+SOURCE_SUM=566c7df9d4967fdca65060f78dc0202febc72ef2691ef72ae256892fc838ea48
+SOURCE_FILENAME=odoo-15.tar.gz
+SOURCE_FORMAT=tar.gz
+SOURCE_SUM_PRG=sha256sum

conf/9.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/odoo/odoo/archive/a25432cd357124242cc6e8ead19b09d58ba530ae.tar.gz
+SOURCE_URL=https://github.com/odoo/odoo/archive/7132a15c38a3b5e5ec232404d21aacfa2ac5874e.tar.gz
-SOURCE_SUM=2e85eaaeb2609223ddda38877715aca5afb7fb8f794bef85e147e7e18e285e05
+SOURCE_SUM=f4c522da29201835435b01c651032d07c2d0c0e8a14b30f9a784cb531c5ba250
 SOURCE_FILENAME=odoo-9.tar.gz
 SOURCE_FORMAT=tar.gz
 SOURCE_SUM_PRG=sha256sum

conf/nginx.conf

@@ -1,9 +1,7 @@
 location / {
-        if ($scheme = http) {
-                rewrite ^ https://$server_name$request_uri? permanent;
-        }
   try_files $uri @__APP__;
 }
+
 location @__APP__ {
   proxy_pass http://127.0.0.1:__PORT__;
   
@@ -24,6 +22,7 @@ location @__APP__ {
   proxy_connect_timeout 720s;
   proxy_send_timeout 720s;
 }
+
 location /longpolling {
   proxy_pass http://127.0.0.1:__PORT_CHAT__;
   proxy_set_header	Host $host;
@@ -35,6 +34,7 @@ location /longpolling {
   proxy_connect_timeout 720s;
   proxy_send_timeout 720s;
 }
+
 location ~* /web/static/ {
   proxy_cache_valid 200 90m;
   proxy_buffering on;

conf/oca-12.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/OCA/OCB/archive/4df6b0b164c6f384fdb7df40e51e80780572273a.tar.gz
+SOURCE_URL=https://github.com/OCA/OCB/archive/f38c99acbea6e1ab42deddb468b9710cabccfbdf.tar.gz
-SOURCE_SUM=e064dcd121ca207cbfa18c5f5f63c394ee6a1ca03f9ebbd6b88e6a62dda6bca0
+SOURCE_SUM=55cb5e87022a87cf13c9d74bf094da2c098cf64fb8fdacbf42fadeea2479daa0
 SOURCE_FILENAME=odoo-12.tar.gz
 SOURCE_FORMAT=tar.gz
 SOURCE_SUM_PRG=sha256sum

conf/oca-14.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/OCA/OCB/archive/b7dc86b530718c090ba26b8eea0154d1c50c05f2.tar.gz
+SOURCE_URL=https://github.com/OCA/OCB/archive/e1e9e7420a5b5b32d5359ffed19e718080764ddd.tar.gz
-SOURCE_SUM=d2ca8bbe913e90f1623c6f2375d4cd2c40d4ed4abb650e66f7691669cbab90fa
+SOURCE_SUM=acfbf7a2428a51962d1d1a084c5a959a392c522b8aad7b98d7abac75c84259d9
 SOURCE_FILENAME=odoo-14.tar.gz
 SOURCE_FORMAT=tar.gz
 SOURCE_SUM_PRG=sha256sum

conf/oca-15.src

@@ -0,0 +1,5 @@
+SOURCE_URL=https://github.com/OCA/OCB/archive/2354fade236b2853835761a129ef2c4ea450d728.tar.gz
+SOURCE_SUM=8bab7886de520295a2db4ab0895b0a3b556a2cd7d77e903347f99762310b636f
+SOURCE_FILENAME=odoo-15.tar.gz
+SOURCE_FORMAT=tar.gz
+SOURCE_SUM_PRG=sha256sum

manifest.json

@@ -6,7 +6,7 @@
         "en": "Suite of business apps (ERP: CRM, Accounting, Point of Sale, HR, Purchases...).",
         "fr": "Une collection d'apps de gestion d'entreprise (ERP : CRM, Comptabilité, Point de Vente, RH, Achats, ...)."
     },
-    "version": "12.0~ynh6",
+    "version": "15.0~ynh1",
     "url": "https://odoo.com",
     "upstream": {
         "license": "LGPL-3.0-only",
@@ -37,10 +37,6 @@
                 "name": "domain",
                 "type": "domain"
             },
-            {
-                "name": "admin",
-                "type": "user"
-            },
             {
                 "name": "version",
                 "type": "string",
@@ -48,8 +44,8 @@
                     "en": "Choose the version you want",
                     "fr": "Choisissez la version désirée"
                 },
-                "choices": ["11", "12", "14"],
+                "choices": ["11", "12", "14", "15"],
-                "default": "14"
+                "default": "15"
             },
             {
                 "name": "oca",
@@ -60,14 +56,6 @@
                     "fr": "Désirez vous installer OCA à la place des sources de LibreERP (pas encore implémenté)"
                 }
             },
-            {
-                "name": "admin_password",
-                "type": "password",
-                "ask": {
-                    "en": "Choose a strong master admin password",
-                    "fr": "Choisissez un mot de passe maître fort pour l'administration"
-                }
-            },
             {
                 "name": "lang",
                 "type": "string",
@@ -86,6 +74,18 @@
                     "fr": "Choisissez un fuseau horaire"
                 },
                 "default": "Etc/UTC"
+            },
+            {
+                "name": "admin",
+                "type": "user"
+            },
+            {
+                "name": "admin_password",
+                "type": "password",
+                "ask": {
+                    "en": "Choose a strong master admin password",
+                    "fr": "Choisissez un mot de passe maître fort pour l'administration"
+                }
             }
         ]
     }

scripts/_common.sh

@@ -27,9 +27,11 @@ function debranding() {
 	find $final_path/$appname -type f \( -iname '*.xml' -o -iname '*.po' \) -exec sed -i 's/<a[^>]*>Powered by <[^>]*>Odoo<\/[^>]*><\/a>//g' {} \;
 	find $final_path/$appname -type f \( -iname '*.xml' -o -iname '*.po' \) -exec sed -i 's/Powered by <[^>]*>Odoo<\/[^>]*>//g' {} \;
 	find $final_path/$appname -type f \( -iname '*.xml' -o -iname '*.po' \) -exec sed -i 's/Powered by <[^>]*><img[^>]*Odoo[^>]*><\/a>//g' {} \;
+	if test -f "$final_path/$appname/addons/web/static/src/xml/base.xml"; then
 		sed -i 's/<a[^>]*>My Odoo.com account<\/a>//g' $final_path/$appname/addons/web/static/src/xml/base.xml
 		sed -i 's/<a[^>]*>Documentation<\/a>//g' $final_path/$appname/addons/web/static/src/xml/base.xml
 		sed -i 's/<a[^>]*>Support<\/a>//g' $final_path/$appname/addons/web/static/src/xml/base.xml
+	fi
 	cp ../conf/logo_type.png  $python_app/addons/base/static/img/logo_white.png
 	cp ../conf/favicon.ico  $final_path/$appname/addons/web/static/src/img/favicon.ico
 

scripts/install

@@ -25,12 +25,12 @@ ynh_abort_if_errors
 
 domain=$YNH_APP_ARG_DOMAIN
 path_url="/"
-admin=$YNH_APP_ARG_ADMIN
 export app_version=$YNH_APP_ARG_VERSION
 oca=$YNH_APP_ARG_OCA
-admin_password=$YNH_APP_ARG_ADMIN_PASSWORD
 lang=$YNH_APP_ARG_LANG
 tz=$YNH_APP_ARG_TZ
+admin=$YNH_APP_ARG_ADMIN
+admin_password=$YNH_APP_ARG_ADMIN_PASSWORD
 
 export app=$YNH_APP_INSTANCE_NAME
 
@@ -164,15 +164,21 @@ if ! wkhtmltopdf --version | grep "wkhtmltopdf 0.12.4 (with patched qt)"; then
 	fi
 fi
 pushd $final_path
+	RUSTUP_HOME="$final_path/.rustup" CARGO_HOME="$final_path/.cargo" bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=stable --profile=minimal'
+	PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin"
 	if grep "python3" $final_path/$appname/$FORKNAME-bin ; then
 		python3 -m venv venv
+		venv/bin/pip3 install --upgrade pip
 		venv/bin/pip3 install wheel
 		venv/bin/pip3 install -r $appname/requirements.txt
 	else
 		virtualenv venv
+		venv/bin/pip3 install --upgrade pip
 		venv/bin/pip install wheel
 		venv/bin/pip install -r $appname/requirements.txt
 	fi
+	ynh_secure_remove --file="$final_path/.cargo"
+	ynh_secure_remove --file="$final_path/.rustup"
 popd
 
 #=================================================

scripts/restore

@@ -57,13 +57,6 @@ test ! -d $final_path \
 
 #=================================================
 # STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX web server configuration..."
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
@@ -95,6 +88,13 @@ ynh_script_progression --message="Reinstalling dependencies..."
 # Define and install dependencies
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
+#=================================================
+# RESTORE THE NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring the NGINX web server configuration..."
+
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+
 #=================================================
 # ADD SWAP
 #=================================================
@@ -123,15 +123,21 @@ if ! wkhtmltopdf --version | grep "wkhtmltopdf 0.12.4 (with patched qt)"; then
 	fi
 fi
 pushd $final_path
+	RUSTUP_HOME="$final_path/.rustup" CARGO_HOME="$final_path/.cargo" bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=stable --profile=minimal'
+	PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin"
 	if grep "python3" $final_path/$appname/$FORKNAME-bin ; then
 		python3 -m venv venv
+		venv/bin/pip3 install --upgrade pip
 		venv/bin/pip3 install wheel
 		venv/bin/pip3 install -r $appname/requirements.txt
 	else
 		virtualenv venv
+		venv/bin/pip3 install --upgrade pip
 		venv/bin/pip install wheel
 		venv/bin/pip install -r $appname/requirements.txt
 	fi
+	ynh_secure_remove --file="$final_path/.cargo"
+	ynh_secure_remove --file="$final_path/.rustup"
 popd
 
 #=================================================

scripts/upgrade

@@ -100,6 +100,14 @@ ynh_script_progression --message="Upgrading dependencies..."
 
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Upgrading NGINX web server configuration..."
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================
@@ -130,15 +138,21 @@ if ! wkhtmltopdf --version | grep "wkhtmltopdf 0.12.4 (with patched qt)"; then
 	fi
 fi
 pushd $final_path
+	RUSTUP_HOME="$final_path/.rustup" CARGO_HOME="$final_path/.cargo" bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=stable --profile=minimal'
+	PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin"
 	if grep "python3" $final_path/$appname/$FORKNAME-bin ; then
 		python3 -m venv venv
+		venv/bin/pip3 install --upgrade pip
 		venv/bin/pip3 install wheel
 		venv/bin/pip3 install -r $appname/requirements.txt
 	else
 		virtualenv venv
+		venv/bin/pip3 install --upgrade pip
 		venv/bin/pip install wheel
 		venv/bin/pip install -r $appname/requirements.txt
 	fi
+	ynh_secure_remove --file="$final_path/.cargo"
+	ynh_secure_remove --file="$final_path/.rustup"	
 popd
 
 #=================================================