Skip to content

GitLab

Commit 65bdbe3c authored by HgO's avatar HgO
Browse files
Options

exit from trap function; ask if we want to cleanup cube_resources folder in... 

exit from trap function; ask if we want to cleanup cube_resources folder in both cases (abort and success)
parent 17fdbbcb
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 45 deletions
locale/fr/LC_MESSAGES/neutrinet.po
View file @ 65bdbe3c
......@@ -736,10 +736,11 @@ msgstr ""
#: neutrinet_cube_install.sh:874
msgid ""
"If you leave this file, you can reuse this information for another install"
"You may want to keep this file if the cube insall failed, as you will no "
"longer need to enter your details."
msgstr ""
"Si vous décidez de garder ce fichier, vous pourrez le réutiliser pour une "
"autre installation"
"Vous aurez sans doute besoin de ce fichier si l'installation de votre brique "
"a échoué, car vous ne devrez plus indiquer vos données personnelles."
#: neutrinet_cube_install.sh:875
msgid ""
......@@ -758,7 +759,7 @@ msgstr "Voulez-vous supprimer le fichier $HYPERCUBE_FILE ?"
msgid "Removing $HYPERCUBE_FILE..."
msgstr "Suppression du fichier $HYPERCUBE_FILE..."
#: neutrinet_cube_install.sh:892
#: neutrinet_cube_install.sh:893
msgid ""
"We stored some resources (Yunohost images, scripts, etc.) in the "
"$CUBE_RESOURCES_LOCATION folder"
......@@ -766,7 +767,7 @@ msgstr ""
"Certaines ressources (images Yunohost, scripts, etc.) ont été stockées dans "
"le dossier $CUBE_RESOURCES_LOCATION."
#: neutrinet_cube_install.sh:893
#: neutrinet_cube_install.sh:894
msgid ""
"These resources could be reused for another cube install, so you wouldn't "
"need to download everything again"
......@@ -774,19 +775,19 @@ msgstr ""
"Ces ressources peuvent être réutilisées pour l'installation d'autres briques "
"internet, de sorte que vous n'auriez pas à les télécharger à nouveau"
#: neutrinet_cube_install.sh:895
#: neutrinet_cube_install.sh:896
msgid "Do you want to remove the $CUBE_RESOURCES_LOCATION folder?"
msgstr "Voulez-vous supprimer le dossier $CUBE_RESOURCES_LOCATION ?"
#: neutrinet_cube_install.sh:897
#: neutrinet_cube_install.sh:898
msgid "Removing cube resources..."
msgstr "Suppression des ressources..."
#: neutrinet_cube_install.sh:915
#: neutrinet_cube_install.sh:916
msgid "Installation aborted"
msgstr "Installation abandonnée"
#: neutrinet_cube_install.sh:923
#: neutrinet_cube_install.sh:924
msgid ""
"Alright, that's all we could do for now. We hope you'll be happy with your "
"cube!"
......@@ -794,27 +795,27 @@ msgstr ""
"Super, c'est tout ce que nous pouvons faire pour l'instant. Nous espérons "
"que vous serez heureux avec votre brique internet !"
#: neutrinet_cube_install.sh:924
#: neutrinet_cube_install.sh:925
msgid "If you have problems, don't hesitate to reach out to us at"
msgstr "Si vous rencontrez des problèmes, n'hésitez pas à nous contacter via"
#: neutrinet_cube_install.sh:925
#: neutrinet_cube_install.sh:926
msgid "* Our wiki: https://wiki.neutrinet.be/cube/problems"
msgstr "* Notre wiki : https://wiki.neutrinet.be/cube/problems"
#: neutrinet_cube_install.sh:926
#: neutrinet_cube_install.sh:927
msgid "* Our Mattermost: https://chat.neutrinet.be"
msgstr "* Notre Mattermost: https://chat.neutrinet.be"
#: neutrinet_cube_install.sh:927
#: neutrinet_cube_install.sh:928
msgid "* On freenode: #neutrinet"
msgstr "* Sur freenode: #neutrinet"
#: neutrinet_cube_install.sh:928
#: neutrinet_cube_install.sh:929
msgid "* Via mail: contact@neutrinet.be"
msgstr "* Par mail: contact@neutrinet.be"
#: neutrinet_cube_install.sh:930
#: neutrinet_cube_install.sh:931
msgid ""
"And if you want to contribute to this awesome project, don't hesitate to "
"contact us ;)"
......@@ -822,19 +823,19 @@ msgstr ""
"Et si vous voulez contribuer à ce fantastique projet, n'hésitez pas à "
"prendre contact avec nous ;)"
#: neutrinet_cube_install.sh:938
#: neutrinet_cube_install.sh:939
msgid "CERTS"
msgstr "CERTS"
#: neutrinet_cube_install.sh:941
#: neutrinet_cube_install.sh:942
msgid "Neutrinet Cube installer"
msgstr "Installateur de Brique Internet pour Neutrinet"
#: neutrinet_cube_install.sh:943
#: neutrinet_cube_install.sh:944
msgid "OPTIONS"
msgstr "OPTIONS"
#: neutrinet_cube_install.sh:945
#: neutrinet_cube_install.sh:946
msgid ""
"Download and prepare all scripts and board images needed for installing a "
"cube"
......@@ -842,7 +843,7 @@ msgstr ""
"Télécharge et prépare toutes les images et scripts nécessaires à "
"l'installation d'une brique"
#: neutrinet_cube_install.sh:946
#: neutrinet_cube_install.sh:947
msgid ""
"Next time this script is run from the same folder as it is run now, these "
"scripts and images will be used"
......@@ -850,18 +851,24 @@ msgstr ""
"La prochaine fois que ce script sera lancé, depuis le même répertoire, ces "
"images et scripts seront utilisés"
#: neutrinet_cube_install.sh:948
#: neutrinet_cube_install.sh:949
msgid "Show this help"
msgstr "Affiche cette aide"
#: neutrinet_cube_install.sh:952
#: neutrinet_cube_install.sh:953
msgid "Setting up the $CUBE_RESOURCES_LOCATION folder..."
msgstr "Configuration du répertoire $CUBE_RESOURCES_LOCATION..."
#: neutrinet_cube_install.sh:958
#: neutrinet_cube_install.sh:959
msgid "Downloading and preparing the $board image..."
msgstr "Téléchargement et préparation de l'image pour la $board..."
#~ msgid ""
#~ "If you leave this file, you can reuse this information for another install"
#~ msgstr ""
#~ "Si vous décidez de garder ce fichier, vous pourrez le réutiliser pour une "
#~ "autre installation"
#~ msgid "Importing VPN certificates from '$VPN_CERTIFICATES_LOCATION'..."
#~ msgstr ""
#~ "Importation des certificats VPN depuis '$VPN_CERTIFICATES_LOCATION'..."
......
locale/neutrinet.pot
View file @ 65bdbe3c
......@@ -616,7 +616,8 @@ msgstr ""
#: neutrinet_cube_install.sh:874
msgid ""
"If you leave this file, you can reuse this information for another install"
"You may want to keep this file if the cube insall failed, as you will no "
"longer need to enter your details."
msgstr ""
#: neutrinet_cube_install.sh:875
......@@ -633,94 +634,94 @@ msgstr ""
msgid "Removing $HYPERCUBE_FILE..."
msgstr ""
#: neutrinet_cube_install.sh:892
#: neutrinet_cube_install.sh:893
msgid ""
"We stored some resources (Yunohost images, scripts, etc.) in the "
"$CUBE_RESOURCES_LOCATION folder"
msgstr ""
#: neutrinet_cube_install.sh:893
#: neutrinet_cube_install.sh:894
msgid ""
"These resources could be reused for another cube install, so you wouldn't "
"need to download everything again"
msgstr ""
#: neutrinet_cube_install.sh:895
#: neutrinet_cube_install.sh:896
msgid "Do you want to remove the $CUBE_RESOURCES_LOCATION folder?"
msgstr ""
#: neutrinet_cube_install.sh:897
#: neutrinet_cube_install.sh:898
msgid "Removing cube resources..."
msgstr ""
#: neutrinet_cube_install.sh:915
#: neutrinet_cube_install.sh:916
msgid "Installation aborted"
msgstr ""
#: neutrinet_cube_install.sh:923
#: neutrinet_cube_install.sh:924
msgid ""
"Alright, that's all we could do for now. We hope you'll be happy with your "
"cube!"
msgstr ""
#: neutrinet_cube_install.sh:924
#: neutrinet_cube_install.sh:925
msgid "If you have problems, don't hesitate to reach out to us at"
msgstr ""
#: neutrinet_cube_install.sh:925
#: neutrinet_cube_install.sh:926
msgid "* Our wiki: https://wiki.neutrinet.be/cube/problems"
msgstr ""
#: neutrinet_cube_install.sh:926
#: neutrinet_cube_install.sh:927
msgid "* Our Mattermost: https://chat.neutrinet.be"
msgstr ""
#: neutrinet_cube_install.sh:927
#: neutrinet_cube_install.sh:928
msgid "* On freenode: #neutrinet"
msgstr ""
#: neutrinet_cube_install.sh:928
#: neutrinet_cube_install.sh:929
msgid "* Via mail: contact@neutrinet.be"
msgstr ""
#: neutrinet_cube_install.sh:930
#: neutrinet_cube_install.sh:931
msgid ""
"And if you want to contribute to this awesome project, don't hesitate to "
"contact us ;)"
msgstr ""
#: neutrinet_cube_install.sh:938
#: neutrinet_cube_install.sh:939
msgid "CERTS"
msgstr ""
#: neutrinet_cube_install.sh:941
#: neutrinet_cube_install.sh:942
msgid "Neutrinet Cube installer"
msgstr ""
#: neutrinet_cube_install.sh:943
#: neutrinet_cube_install.sh:944
msgid "OPTIONS"
msgstr ""
#: neutrinet_cube_install.sh:945
#: neutrinet_cube_install.sh:946
msgid ""
"Download and prepare all scripts and board images needed for installing a "
"cube"
msgstr ""
#: neutrinet_cube_install.sh:946
#: neutrinet_cube_install.sh:947
msgid ""
"Next time this script is run from the same folder as it is run now, these "
"scripts and images will be used"
msgstr ""
#: neutrinet_cube_install.sh:948
#: neutrinet_cube_install.sh:949
msgid "Show this help"
msgstr ""
#: neutrinet_cube_install.sh:952
#: neutrinet_cube_install.sh:953
msgid "Setting up the $CUBE_RESOURCES_LOCATION folder..."
msgstr ""
#: neutrinet_cube_install.sh:958
#: neutrinet_cube_install.sh:959
msgid "Downloading and preparing the $board image..."
msgstr ""
neutrinet_cube_install.sh
View file @ 65bdbe3c
......@@ -871,12 +871,13 @@ function cleanup_hypercube_file() {
echo
info $"During this install, we created the $HYPERCUBE_FILE file with the personal details you entered earlier"
info $"If you leave this file, you can reuse this information for another install"
info $"You may want to keep this file if the cube insall failed, as you will no longer need to enter your details."
warn $"This file contains the passwords you provided! For safety reasons, you shouldn't keep it longer than needed!!!"
if confirm $"Do you want to remove the $HYPERCUBE_FILE file?" $default_answer
then
info $"Removing $HYPERCUBE_FILE..."
rm -f "$HYPERCUBE_FILE"
fi
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment