YunoHost/yunodevtools
1
0
Fork 0
mirror of https://github.com/YunoHost/yunodevtools.git synced 2024-09-03 20:16:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

appgenerator: misc fixes (#2254)

Browse source 
* appgenerator: docs -> doc

* appgenerator: remove stuff related to DISCLAIMER.md which is not used in packaging v2 anymore
This commit is contained in:
Alexandre Aubin 2024-04-23 20:11:15 +02:00 • committed by GitHub
parent 8e9893cd06
commit 263556a6da
3 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
tools/app_generator/app.py
View file

@ -539,16 +539,6 @@ Do not give the software name at the beginning, as it will be integrated an 'Ove
"spellcheck": "false", "spellcheck": "false",
}, },
) )
disclaimer = TextAreaField(
lazy_gettext(
"Type the DISCLAIMER.md file content, which list warnings and attention points."
),
validators=[Optional()],
render_kw={
"class": "form-control",
"spellcheck": "false",
},
)
pre_install = TextAreaField( pre_install = TextAreaField(
lazy_gettext("Type the PRE_INSTALL.md file content"), lazy_gettext("Type the PRE_INSTALL.md file content"),
validators=[Optional()], validators=[Optional()],
@ -751,25 +741,22 @@ def main_form_route():
# app_files.append(AppFile("php", "conf/extra_php-fpm.conf")) # app_files.append(AppFile("php", "conf/extra_php-fpm.conf"))
if main_form.description.data: if main_form.description.data:
app_files.append(AppFile("DESCRIPTION", "docs/DESCRIPTION.md")) app_files.append(AppFile("DESCRIPTION", "doc/DESCRIPTION.md"))
if main_form.disclaimer.data:
app_files.append(AppFile("DISCLAIMER", "docs/DISCLAIMER.md"))
if main_form.pre_install.data: if main_form.pre_install.data:
app_files.append(AppFile("PRE_INSTALL", "docs/PRE_INSTALL.md")) app_files.append(AppFile("PRE_INSTALL", "doc/PRE_INSTALL.md"))
if main_form.post_install.data: if main_form.post_install.data:
app_files.append(AppFile("POST_INSTALL", "docs/POST_INSTALL.md")) app_files.append(AppFile("POST_INSTALL", "doc/POST_INSTALL.md"))
if main_form.pre_upgrade.data: if main_form.pre_upgrade.data:
app_files.append(AppFile("PRE_UPGRADE", "docs/PRE_UPGRADE.md")) app_files.append(AppFile("PRE_UPGRADE", "doc/PRE_UPGRADE.md"))
if main_form.post_upgrade.data: if main_form.post_upgrade.data:
app_files.append(AppFile("POST_UPGRADE", "docs/POST_UPGRADE.md")) app_files.append(AppFile("POST_UPGRADE", "doc/POST_UPGRADE.md"))
if main_form.admin.data: if main_form.admin.data:
app_files.append(AppFile("ADMIN", "docs/ADMIN.md")) app_files.append(AppFile("ADMIN", "doc/ADMIN.md"))
template_dir = os.path.dirname(__file__) + "/templates/" template_dir = os.path.dirname(__file__) + "/templates/"
for app_file in app_files: for app_file in app_files:

1
tools/app_generator/templates/DISCLAIMER.j2
View file

@ -1 +0,0 @@
This is a dummy disclaimer that will be added to the README.MD of your app.

1
tools/app_generator/templates/index.html
View file

@ -252,7 +252,6 @@ YunoHost app generator
<div class="panel-body collapsible collapsed"> <div class="panel-body collapsible collapsed">
<p><i>{{ gettext("A more complete presentation that the summary completed above, explaining to what correspond the software, the eventual warnings and specific details on its functioning in Yunohost (it's the place where one can warn about integration issues).") }}</i></p> <p><i>{{ gettext("A more complete presentation that the summary completed above, explaining to what correspond the software, the eventual warnings and specific details on its functioning in Yunohost (it's the place where one can warn about integration issues).") }}</i></p>
{{ form_field(main_form.description) }} {{ form_field(main_form.description) }}
{{ form_field(main_form.disclaimer) }}
<p><i>{{ gettext("Indications to show at key steps to manage the package : installation, update, message to the admin account. You usually don't have to fill them.") }}</i></p> <p><i>{{ gettext("Indications to show at key steps to manage the package : installation, update, message to the admin account. You usually don't have to fill them.") }}</i></p>
{{ form_field(main_form.pre_install) }} {{ form_field(main_form.pre_install) }}