develop option & corrections

manifest.toml

@@ -6,7 +6,7 @@ name = "Diacamma"
 description.en = "Management application for volunteers (association, condominium)"
 description.fr = "Application de gestion pour les bénévoles (association, copropriété)"
 
-version = "23.12.15.15~ynh1"
+version = "23.12.15.16~ynh1"
 
 maintainers = ["Laurent Gay"]
 
@@ -65,10 +65,16 @@ ram.runtime = "50M"
     [install.archive]
     ask.en = "Archive to upload"
     ask.fr = "Archive à télécharger"
-    type = "string"
+    type = "url"
     optional = true
     default = ""
     
+    [install.develop]
+    ask.en = "Use the development version"
+    ask.fr = "Utiliser la version de développement"
+    type = "boolean"
+    default = false
+
 [resources]
     # See the packaging documentation for the full set
     # of explanation regarding the behavior and properties for each of those

scripts/install

@@ -10,9 +10,15 @@ ynh_script_progression --message="Installing app..." --weight=5
 
 pushd $install_dir
 python3 -m venv venv
-cat "https://pypi.diacamma.org" > extra_url
-venv/bin/pip3 install -U lucterios lucterios-standard lucterios-contacts lucterios-documents --extra-index-url "https://pypi.diacamma.org"
-venv/bin/pip3 install -U diacamma-asso diacamma-syndic diacamma-financial --extra-index-url "https://pypi.diacamma.org"
+if [ "$develop" == "true" ]
+then
+    echo "https://pypi.diacamma.org" > extra_url
+    pip_option='--extra-index-url "https://pypi.diacamma.org"'
+else
+    pip_option=''
+fi
+venv/bin/pip3 install -U lucterios lucterios-standard lucterios-contacts lucterios-documents $pip_option 
+venv/bin/pip3 install -U diacamma-asso diacamma-syndic diacamma-financial $pip_option
 venv/bin/pip3 install -U gunicorn psycopg2-binary psycopg2 django-auth-ldap3-ad
 sed -i 's|member=%s|inheritPermission=%s|g' venv/lib/python*/site-packages/django_auth_ldap3_ad/auth.py
 venv/bin/lucterios_admin.py installed
@@ -21,8 +27,6 @@ extra_json=$(jq -c . /tmp/extra.json)
 venv/bin/lucterios_admin.py add -n inst-${app} -p "${APPLITYPE}" -m "${MODULES}" -d "${DATABASE}" -e ''$extra_json''
 popd
 
-refresh_collect
-
 if [ ! -z "$archive" ]
 then
     curl $archive > /tmp/diacamma_archive.lbk
@@ -31,6 +35,8 @@ then
     popd    
 fi
 
+refresh_collect
+
 check_params
 
 #=================================================